handle properly minOccurs and maxOccurs in sequences

goetas-webservices · Sep 29, 2022 · a4de23d · a4de23d
1 parent a737a81
commit a4de23d
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 7 deletions.
diff --git a/src/SchemaReader.php b/src/SchemaReader.php
@@ -338,7 +338,7 @@ private static function maybeSetDefault(InterfaceSetDefault $ref, DOMElement $no
         }
     }
 
-    private function loadSequence(ElementContainer $elementContainer, DOMElement $node, int $max = null): void
+    private function loadSequence(ElementContainer $elementContainer, DOMElement $node, int $max = null, int $min = null): void
     {
         $max =
             (
@@ -348,6 +348,13 @@ private function loadSequence(ElementContainer $elementContainer, DOMElement $no
             )
                 ? 2
                 : null;
+        $min =
+            (
+                $min === null &&
+                !$node->hasAttribute('minOccurs')
+            )
+                ? null
+                : (int) max((int) $min, $node->getAttribute('minOccurs'));
 
         self::againstDOMNodeList(
             $node,
@@ -356,13 +363,15 @@ function (
                 DOMElement $childNode
             ) use (
                 $elementContainer,
-                $max
+                $max,
+                $min
             ): void {
                 $this->loadSequenceChildNode(
                     $elementContainer,
                     $node,
                     $childNode,
-                    $max
+                    $max,
+                    $min
                 );
             }
         );
@@ -372,7 +381,8 @@ private function loadSequenceChildNode(
         ElementContainer $elementContainer,
         DOMElement $node,
         DOMElement $childNode,
-        ? int $max
+        ? int $max,
+        ? int $min = null
     ): void {
         switch ($childNode->localName) {
             case 'sequence':
@@ -381,15 +391,17 @@ private function loadSequenceChildNode(
                 $this->loadSequence(
                     $elementContainer,
                     $childNode,
-                    $max
+                    $max,
+                    $min
                 );
                 break;
             case 'element':
                 $this->loadSequenceChildNodeLoadElement(
                     $elementContainer,
                     $node,
                     $childNode,
-                    $max
+                    $max,
+                    $min
                 );
                 break;
             case 'group':
@@ -407,7 +419,8 @@ private function loadSequenceChildNodeLoadElement(
         ElementContainer $elementContainer,
         DOMElement $node,
         DOMElement $childNode,
-        ? int $max
+        ? int $max,
+        ? int $min
     ): void {
         if ($childNode->hasAttribute('ref')) {
             $elementDef = $this->findElement($elementContainer->getSchema(), $node, $childNode->getAttribute('ref'));
@@ -436,6 +449,11 @@ private function loadSequenceChildNodeLoadElement(
                 $childNode
             );
         }
+
+        if ($min !== null) {
+            $element->setMin($min);
+        }
+
         if ($max > 1) {
             /*
             * although one might think the typecast is not needed with $max being `? int $max` after passing > 1,

diff --git a/tests/TypesTest.php b/tests/TypesTest.php
@@ -140,6 +140,66 @@ public function testElementMaxOccurences($xml, $expected)
         $this->assertEquals($expected, $elements[0]->getMax());
     }
 
+    /**
+     * @dataProvider getMinOccurencesOverride
+     */
+    public function testSequencMinOccursOverride($xml, $expected)
+    {
+        $schema = $this->reader->readString(
+            '
+            <xs:schema targetNamespace="http://www.example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:complexType name="complexType">
+                    <xs:sequence minOccurs="'.$xml.'" >
+                        <xs:element name="el1" minOccurs="1" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:schema>');
+
+        $complex = $schema->findType('complexType', 'http://www.example.com');
+        $elements = $complex->getElements();
+        $this->assertEquals($expected, $elements[0]->getMin());
+    }
+
+    public function getMinOccurencesOverride()
+    {
+        return [
+            ['2', 2],
+            ['1', 1],
+            ['0', 0],
+        ];
+    }
+
+    /**
+     * @dataProvider getMaxOccurencesOverride
+     */
+    public function testSequencMaxOccursOverride($xml, $expected)
+    {
+        $schema = $this->reader->readString(
+            '
+            <xs:schema targetNamespace="http://www.example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:complexType name="complexType">
+                    <xs:sequence maxOccurs="'.$xml.'" >
+                        <xs:element name="el1" maxOccurs="5" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:schema>');
+
+        $complex = $schema->findType('complexType', 'http://www.example.com');
+        $elements = $complex->getElements();
+        $this->assertEquals($expected, $elements[0]->getMax());
+    }
+
+    public function getMaxOccurencesOverride()
+    {
+        return [
+            ['0', 5], //maxOccurs=0 is ignored
+            ['1', 5],
+            ['2', 2], // 2 in this case just means "many"
+            ['unbounded', 2], // 2 in this case just means "many"
+        ];
+    }
+
+
     public function getMinOccurences()
     {
         return [