Merge pull request #53 from alexmmm/fix-required-validation

Fix draft 3 'required' validation issues

Author: justinrainbow

src/JsonSchema/Constraints/Undefined.php

@@ -109,22 +109,23 @@ protected function validateCommonProperties($value, $schema = null, $path = null
 
         // Verify required values
         if (is_object($value)) {
-            if ($value instanceof Undefined) {
-                // Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
-                if (isset($schema->required) && $schema->required) {
-                    $this->addError($path, "is missing and it is required");
-                }
-            } else if (isset($schema->required)) {
+            if (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 {
-                $this->checkType($value, $schema, $path);
+            } else if (isset($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");
+                }
             }
-        } else {
+        }
+
+        // Verify type
+        if (!($value instanceof Undefined)) {
             $this->checkType($value, $schema, $path);
         }
 

tests/JsonSchema/Tests/Constraints/RequiredPropertyTest.php

@@ -68,6 +68,82 @@ public function getInvalidTests()
                 '{
                     "required": ["foo"]
                 }'
+            ),
+            array(
+                '{
+                }',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "foo": { "required": true }
+                    }
+                }'
+            ),
+            array(
+                '{
+                  "string":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "string":{"type":"string", "required": true}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "number":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "number":{"type":"number", "required": true}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "integer":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "integer":{"type":"integer", "required": true}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "boolean":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "boolean":{"type":"boolean", "required": true}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "array":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "array":{"type":"array", "required": true}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "null":{}
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "null":{"type":"null", "required": true}
+                  }
+                }'
             )
         );
     }
@@ -179,6 +255,17 @@ public function getValidTests()
                     },
                     "required": ["foo"]
                 }'
+            ),
+            array(
+                '{
+                    "foo": {}
+                }',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "foo": { "required": true }
+                    }
+                }'
             )
         );
     }