separate 'type' from 'required' validation, fixing failing unit tests

alexmmm · alexmmm · commit 65d4a0bec255 · 2013-07-14T23:54:56.000+02:00
diff --git a/src/JsonSchema/Constraints/Undefined.php b/src/JsonSchema/Constraints/Undefined.php
@@ -121,12 +121,11 @@ protected function validateCommonProperties($value, $schema = null, $path = null
                 if ( $schema->required && $value instanceof Undefined) {
                     $this->addError($path, "is missing and it is required");
                 }
-            } else if ($value instanceof Undefined) {
-                // don't check type of Undefined value
-            } else {
-                $this->checkType($value, $schema, $path);
             }
-        } else {
+        }
+
+        // Verify type
+        if( ($value instanceof Undefined) === false) {
             $this->checkType($value, $schema, $path);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,11 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`121`	`121`	`if ( $schema->required && $value instanceof Undefined) {`
`122`	`122`	`$this->addError($path, "is missing and it is required");`
`123`	`123`	`}`
`124`		`- } else if ($value instanceof Undefined) {`
`125`		`- // don't check type of Undefined value`
`126`		`- } else {`
`127`		`- $this->checkType($value, $schema, $path);`
`128`	`124`	`}`
`129`		`- } else {`
	`125`	`+ }`
	`126`	`+`
	`127`	`+ // Verify type`
	`128`	`+ if( ($value instanceof Undefined) === false) {`
`130`	`129`	`$this->checkType($value, $schema, $path);`
`131`	`130`	`}`
`132`	`131`