avoid passing null to max function

goetas-webservices · Jan 16, 2024 · 520f5d6 · 520f5d6
1 parent 612413f
commit 520f5d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/SchemaReader.php b/src/SchemaReader.php
@@ -403,7 +403,8 @@ private function loadMinFromNode(\DOMElement $node, ?int $min): ?int
 
         $minOccurs = (int) $node->getAttribute('minOccurs');
 
-        return max($min, $minOccurs);
+        // NOTE must not pass "null" to max() function, because "max(null, 0)" returns "null" instead of "0"
+        return max((int) $min, $minOccurs);
     }
 
     private function loadMaxFromNode(\DOMElement $node, ?int $max): ?int
@@ -499,7 +500,8 @@ private function loadSequenceChildNodeLoadElement(
         $this->resolveSubstitutionGroup($schema, $node, $childNode, $element);
 
         if (null !== $min) {
-            $element->setMin($min);
+            // NOTE must not pass "null" to max() function, because "max(null, 0)" returns "null" instead of "0"
+            $element->setMin(max((int) $element->getMin(), $min));
         }
 
         if (null !== $max && 1 < $max) {

diff --git a/tests/TypesTest.php b/tests/TypesTest.php
@@ -181,13 +181,14 @@ public function testSequenceMinOccursOverride($sequenceMinOccurs, $childMinOccur
     public function getMinOccurencesOverride(): array
     {
         return [
-            ['0', '2', 2],
-            ['3', '2', 3],
+            ['0', '5', 5],
             ['0', '1', 1],
             ['1', '1', 1],
             ['2', '1', 2],
-            ['0', '0', 0],
             ['3', '0', 3],
+            ['3', '2', 3],
+            ['0', '0', 0],
+            [null, '0', 0],
         ];
     }