Merge pull request #186 from mrix/fix-additional-properties-validation

Fix additional properties validation

Author: bighappyface

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -65,7 +65,7 @@ public function validateTypes($value, $schema = null, $path = null, $i = null)
         }
 
         // check object
-        if (is_object($value) && (isset($schema->properties) || isset($schema->patternProperties))) {
+        if (is_object($value) && (isset($schema->properties) || isset($schema->patternProperties) || isset($schema->additionalProperties))) {
             $this->checkObject(
                 $value,
                 isset($schema->properties) ? $schema->properties : null,

tests/JsonSchema/Tests/Constraints/AdditionalPropertiesTest.php

@@ -81,7 +81,29 @@ public function getInvalidTests()
                   "additionalProperties": {"type":"string"}
                 }',
                 Validator::CHECK_MODE_TYPE_CAST
-            )
+            ),
+            array(
+                '{
+                  "prop1": "a",
+                  "prop2": "b"
+                }',
+                '{
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "boolean"
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "prop1": "a",
+                  "prop2": "b"
+                }',
+                '{
+                  "type": "object",
+                  "additionalProperties": false
+                }'
+            ),
         );
     }
 
@@ -138,7 +160,29 @@ public function getValidTests()
                   },
                   "additionalProperties": true
                 }'
-            )
+            ),
+            array(
+                '{
+                  "prop1": "a",
+                  "prop2": "b"
+                }',
+                '{
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "prop1": "a",
+                  "prop2": "b"
+                }',
+                '{
+                  "type": "object",
+                  "additionalProperties": true
+                }'
+            ),
         );
     }
 }