Fix issues with the use of disallow. Add draft v3 disallow unit tests.

Author: Michael Chiocca

src/JsonSchema/Constraints/Undefined.php

@@ -111,7 +111,9 @@ protected function validateCommonProperties($value, $schema = null, $path = null
         if (isset($schema->disallow)) {
             $initErrors = $this->getErrors();
 
-            $this->checkUndefined($value, $schema->disallow, $path);
+            $typeSchema = new \stdClass();
+            $typeSchema->type = $schema->disallow;
+            $this->checkType($value, $typeSchema, $path);
 
             // if no new errors were raised it must be a disallowed value
             if (count($this->getErrors()) == count($initErrors)) {

tests/JsonSchema/Tests/Constraints/DisallowTest.php

@@ -16,7 +16,7 @@ public function getInvalidTests()
         return array(
             array(
                 '{
-                  "value":" The xpto is weird"
+                  "value":"The xpto is weird"
                 }',
                 '{
                   "type":"object",
@@ -41,6 +41,60 @@ public function getInvalidTests()
                     }
                   }
                 }'
+            ),
+            array(
+                '{"value": 1}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {"type": "any", "disallow": "integer"}
+                    }
+                }'
+            ),
+            array(
+                '{"value": true}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {"type": "any", "disallow": ["integer", "boolean"]}
+                    }
+                }'
+            ),
+            array(
+                '{"value": "foo"}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "any",
+                            "disallow":
+                                ["string", {
+                                    "type": "object",
+                                    "properties": {
+                                        "foo": {"type": "string"}
+                                    }
+                                }]
+                        }
+                    }
+                }'
+            ),
+            array(
+                '{"value": {"foo": "bar"}}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "any",
+                            "disallow":
+                                ["string", {
+                                    "type": "object",
+                                    "properties": {
+                                        "foo": {"type": "string"}
+                                    }
+                                }]
+                        }
+                    }
+                }'
             )
         );
     }
@@ -50,7 +104,7 @@ public function getValidTests()
         return array(
             array(
                 '{
-                  "value":" The xpto is weird"
+                  "value":"The xpto is weird"
                 }',
                 '{
                   "type":"object",
@@ -75,6 +129,33 @@ public function getValidTests()
                     }
                   }
                 }'
+            ),
+            array(
+                '{"value": {"foo": 1}}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "any",
+                            "disallow":
+                                ["string", {
+                                    "type": "object",
+                                    "properties": {
+                                        "foo": {"type": "string"}
+                                    }
+                                }]
+                        }
+                    }
+                }'
+            ),
+            array(
+                '{"value": true}',
+                '{
+                    "type": "object",
+                    "properties": {
+                        "value": {"type": "any", "disallow": "string"}
+                    }
+                }'
             )
         );
     }