fix: only check minProperties or maxProperties on objects

https://www.learnjsonschema.com/draft4/validation/minproperties/ / https://json-schema.org/draft-04/draft-fge-json-schema-validation-00#rfc.section.5.4.2

Author: DannyvdSluijs

src/JsonSchema/Constraints/ObjectConstraint.php

@@ -175,15 +175,19 @@ protected function &getProperty(&$element, $property, $fallback = null)
      */
     protected function validateMinMaxConstraint($element, $objectDefinition, ?JsonPointer $path = null)
     {
+        if (!$this->getTypeCheck()::isObject($element)) {
+            return;
+        }
+
         // Verify minimum number of properties
-        if (isset($objectDefinition->minProperties) && !is_object($objectDefinition->minProperties)) {
-            if ($this->getTypeCheck()->propertyCount($element) < $objectDefinition->minProperties) {
+        if (isset($objectDefinition->minProperties) && is_int($objectDefinition->minProperties)) {
+            if ($this->getTypeCheck()->propertyCount($element) < max(0, $objectDefinition->minProperties)) {
                 $this->addError(ConstraintError::PROPERTIES_MIN(), $path, ['minProperties' => $objectDefinition->minProperties]);
             }
         }
         // Verify maximum number of properties
-        if (isset($objectDefinition->maxProperties) && !is_object($objectDefinition->maxProperties)) {
-            if ($this->getTypeCheck()->propertyCount($element) > $objectDefinition->maxProperties) {
+        if (isset($objectDefinition->maxProperties) && is_int($objectDefinition->maxProperties)) {
+            if ($this->getTypeCheck()->propertyCount($element) > max(0, $objectDefinition->maxProperties)) {
                 $this->addError(ConstraintError::PROPERTIES_MAX(), $path, ['maxProperties' => $objectDefinition->maxProperties]);
             }
         }

tests/Constraints/MinMaxPropertiesTest.php

@@ -19,7 +19,7 @@ class MinMaxPropertiesTest extends BaseTestCase
     public function getValidTests(): array
     {
         return [
-            [
+            'Empty object with minProperties: 0' => [
                 '{
                   "value": {}
                 }',
@@ -30,7 +30,7 @@ public function getValidTests(): array
                   }
                 }'
             ],
-            [
+            'Empty object with maxProperties: 1' => [
                 '{
                   "value": {}
                 }',
@@ -41,7 +41,7 @@ public function getValidTests(): array
                   }
                 }'
             ],
-            [
+            'Empty object with minProperties: 0 and maxProperties: 1' => [
                 '{
                   "value": {}
                 }',
@@ -52,7 +52,7 @@ public function getValidTests(): array
                   }
                 }'
             ],
-            [
+            'Object with two properties with minProperties: 1 and maxProperties: 2' => [
                 '{
                   "value": {"foo": 1, "bar": 2}
                 }',
@@ -63,6 +63,26 @@ public function getValidTests(): array
                   }
                 }'
             ],
+            'Empty array with minProperties: 1 and maxProperties: 2' => [
+                '{
+                  "value": []
+                }',
+                '{
+                  "properties": {
+                    "value": {"minProperties": 1,"maxProperties": 2}
+                  }
+                }'
+            ],
+            'Array with two items with maxProperties: 1' => [
+                '{
+                  "value": [1, 2]
+                }',
+                '{
+                  "properties": {
+                    "value": {""maxProperties": 1}
+                  }
+                }'
+            ],
         ];
     }
 
@@ -72,7 +92,7 @@ public function getValidTests(): array
     public function getInvalidTests(): array
     {
         return [
-            [
+            'Empty object with minProperties: 1' => [
                 '{
                   "value": {}
                 }',
@@ -83,7 +103,7 @@ public function getInvalidTests(): array
                   }
                 }'
             ],
-            [
+            'Empty object with minProperties' => [
                 '{}',
                 '{
                   "type": "object",
@@ -98,7 +118,7 @@ public function getInvalidTests(): array
                   "minProperties": 1
                 }'
             ],
-            [
+            'Object with two properties with maxProperties: 1' => [
                 '{
                   "value": {
                     "propertyOne": "valueOne",
@@ -112,7 +132,7 @@ public function getInvalidTests(): array
                   }
                 }'
             ],
-            [
+            'Object with two properties with minProperties: 1 and maxProperties: 2' => [
                 '{
                   "value": {"foo": 1, "bar": 2, "baz": 3}
                 }',
@@ -123,16 +143,6 @@ public function getInvalidTests(): array
                   }
                 }'
             ],
-            [
-                '{
-                  "value": []
-                }',
-                '{
-                  "properties": {
-                    "value": {"minProperties": 1,"maxProperties": 2}
-                  }
-                }'
-            ],
         ];
     }
 }