Merge pull request #103 from alexmmm/fix-required-property-validation

Fix required property validation

Author: justinrainbow

src/JsonSchema/Constraints/Undefined.php

@@ -117,14 +117,15 @@ protected function validateCommonProperties($value, $schema = null, $path = null
 
         // Verify required values
         if (is_object($value)) {
-            if (isset($schema->required) && is_array($schema->required) ) {
+
+            if (!($value instanceof Undefined) && isset($schema->required) && is_array($schema->required) ) {
                 // Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]
                 foreach ($schema->required as $required) {
                     if (!property_exists($value, $required)) {
                         $this->addError($path, "the property " . $required . " is required");
                     }
                 }
-            } else if (isset($schema->required)) {
+            } else if (isset($schema->required) && !is_array($schema->required)) {
                 // Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
                 if ( $schema->required && $value instanceof Undefined) {
                     $this->addError($path, "is missing and it is required");

tests/JsonSchema/Tests/Constraints/RequiredPropertyTest.php

@@ -144,7 +144,40 @@ public function getInvalidTests()
                     "null":{"type":"null", "required": true}
                   }
                 }'
-            )
+            ),
+            array(
+                '{
+                  "foo": {"baz": 1.5}
+                }',
+                '{
+                  "type": "object",
+                  "properties": {
+                    "foo": {
+                      "type": "object",
+                      "properties": {
+                        "bar": {"type": "number"}
+                      },
+                      "required": ["bar"]
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "foo": {"baz": 1.5}
+                }',
+                '{
+                  "type": "object",
+                  "properties": {
+                    "foo": {
+                      "type": "object",
+                      "properties": {
+                        "bar": {"type": "number", "required": true}
+                      }
+                    }
+                  }
+                }'
+            ),
         );
     }
 
@@ -266,7 +299,40 @@ public function getValidTests()
                         "foo": { "required": true }
                     }
                 }'
-            )
+            ),
+            array(
+                '{
+                  "boo": {"bar": 1.5}
+                }',
+                '{
+                  "type": "object",
+                  "properties": {
+                    "foo": {
+                      "type": "object",
+                      "properties": {
+                        "bar": {"type": "number"}
+                      },
+                      "required": ["bar"]
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "boo": {"bar": 1.5}
+                }',
+                '{
+                  "type": "object",
+                  "properties": {
+                    "foo": {
+                      "type": "object",
+                      "properties": {
+                        "bar": {"type": "number", "required": true}
+                      }
+                    }
+                  }
+                }'
+            ),
         );
     }
 }