feat(generator): support anonymous sub list types

Author: roydejong

src/Generation/XsdToAbstractEntity.php

@@ -8,6 +8,7 @@
 class XsdToAbstractEntity
 {
     private \SimpleXMLElement $xsd;
+    private string $targetDirectory;
 
     public function __construct(string $xsdPath)
     {
@@ -38,16 +39,18 @@ private function loadXsd(string $xsdPath): void
 
     public function processAll(string $targetDirectory): void
     {
+        $this->targetDirectory = $targetDirectory;
+
         foreach ($this->xsd->children() as $entry) {
             if ($entry->getName() === "complexType") {
-                $this->processOne($targetDirectory, $entry);
+                $this->processOne($entry);
             }
         }
     }
 
-    public function processOne(string $targetDirectory, \SimpleXMLElement $xsd): bool
+    private function processOne(\SimpleXMLElement $xsdElement, string $overrideName = null): bool
     {
-        $entityName = (string)$xsd->attributes()['name'];
+        $entityName = $overrideName ? $overrideName : (string)$xsdElement->attributes()['name'];
 
         if (empty($entityName) || in_array($entityName, self::$typeBlackList)) {
             return false;
@@ -60,7 +63,7 @@ public function processOne(string $targetDirectory, \SimpleXMLElement $xsd): boo
 
         $anyEntries = false;
 
-        foreach ($xsd->children() as $child) {
+        foreach ($xsdElement->children() as $child) {
             foreach ($child as $element) {
                 if ($this->writeElement($buffer, $element)) {
                     $anyEntries = true;
@@ -74,7 +77,7 @@ public function processOne(string $targetDirectory, \SimpleXMLElement $xsd): boo
 
         $this->writeFooter($buffer);
 
-        $targetPath = $targetDirectory . "/{$entityName}.php";
+        $targetPath = $this->targetDirectory . "/{$entityName}.php";
 
         if ($this->checkForChanges($buffer, $targetPath)) {
             // Change detected, write file
@@ -153,19 +156,35 @@ private function writeElement(string &$buffer, \SimpleXMLElement $element): bool
         $minOccurs = (int)($attrs['minOccurs'] ?? 1);
         $maxOccurs = (int)($attrs['maxOccurs'] ?? 1);
 
-        if (empty($name) || empty($type)) {
-            return false;
+        $isArray = $maxOccurs > 1 || $attrs['maxOccurs'] == "unbounded";
+        $isNullable = $minOccurs === 0;
+
+        // -------------------------------------------------------------------------------------------------------------
+        // Nested complex types
+
+        // Some nodes, like <allergens> are empty arrays containing an array of a sub element like <allergeninfo>
+        // These are basically anonymous and useless entities that we'll need create ourselves
+
+        foreach ($element->children() as $child) {
+            if ($child->getName() === "complexType") {
+                $this->processOne($child, $name);
+                $type = $name;
+            }
         }
 
-        $phpDocText = null;
-        $phpDocVarType = null;
+        // -------------------------------------------------------------------------------------------------------------
+        // Process check
 
-        $isArray = $maxOccurs > 1 || $attrs['maxOccurs'] == "unbounded";
-        $isNullable = $minOccurs === 0;
+        if (empty($name) || empty($type)) {
+            return false;
+        }
 
         // -------------------------------------------------------------------------------------------------------------
         // Determine php type
 
+        $phpDocText = null;
+        $phpDocVarType = null;
+
         if ($type === "string" || str_starts_with($type, "translationtype_")
             || str_starts_with($type, "string_")) {
             $phpTypeText = "string";

src/Models/Entities/Allergens.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Allergens PS-API type 
+ * @generated 2021-08-24
+ **/
+class Allergens extends AbstractEntity
+{
+	/**
+	 * @var Allergeninfo[]
+	 */
+	public array $allergeninfo;
+}

src/Models/Entities/Allergenset.php

@@ -6,9 +6,10 @@
 
 /**
  * Allergenset PS-API type 
- * @generated 2021-07-14
+ * @generated 2021-08-24
  **/
 class Allergenset extends AbstractEntity
 {
 	public ?string $allergencomment = null;
+	public Allergens $allergens;
 }

src/Models/Entities/Alternativegtins.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Alternativegtins PS-API type 
+ * @generated 2021-08-24
+ **/
+class Alternativegtins extends AbstractEntity
+{
+	/**
+	 * @var Alternativegtin[]
+	 */
+	public array $alternativegtin;
+}

src/Models/Entities/Assetangletypes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Assetangletypes PS-API type 
+ * @generated 2021-08-24
+ **/
+class Assetangletypes extends AbstractEntity
+{
+	/**
+	 * @var Assetangletype[]
+	 */
+	public array $assetangletype;
+}

src/Models/Entities/Assetfacingtypes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Assetfacingtypes PS-API type 
+ * @generated 2021-08-24
+ **/
+class Assetfacingtypes extends AbstractEntity
+{
+	/**
+	 * @var Assetfacingtype[]
+	 */
+	public array $assetfacingtype;
+}

src/Models/Entities/Assetformattypes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Assetformattypes PS-API type 
+ * @generated 2021-08-24
+ **/
+class Assetformattypes extends AbstractEntity
+{
+	/**
+	 * @var Assetformattype[]
+	 */
+	public array $assetformattype;
+}

src/Models/Entities/Assetlabels.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Assetlabels PS-API type 
+ * @generated 2021-08-24
+ **/
+class Assetlabels extends AbstractEntity
+{
+	/**
+	 * @var Assetlabel[]
+	 */
+	public array $assetlabel;
+}

src/Models/Entities/Assettypes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Assettypes PS-API type 
+ * @generated 2021-08-24
+ **/
+class Assettypes extends AbstractEntity
+{
+	/**
+	 * @var Assettype[]
+	 */
+	public array $assettype;
+}

src/Models/Entities/Catchzoneinfolist.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace SoftwarePunt\PSAPI\Models\Entities;
+
+use SoftwarePunt\PSAPI\Models\AbstractEntity;
+
+/**
+ * Catchzoneinfolist PS-API type 
+ * @generated 2021-08-24
+ **/
+class Catchzoneinfolist extends AbstractEntity
+{
+	/**
+	 * @var Fishcatchzoneinfo[]
+	 */
+	public array $catchzoneinfo;
+}