fix regression braking required in v3 schemas

Author: janmentzel

src/JsonSchema/Constraints/Undefined.php

@@ -109,7 +109,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null
                 if (isset($schema->required) && $schema->required) {
                     $this->addError($path, "is missing and it is required");
                 }
-            } else if (isset($schema->required)) {
+            } else 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)) {

tests/JsonSchema/ValidatorTest.php

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * integration test for JsonSchema\Validator
+ *
+ * run tests against the example schema hierarchy in /tests/fixtures/
+ *
+ * This file is part of the JsonSchema package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace JsonSchema;
+
+class ValidatorTest extends \PHPUnit_Framework_TestCase
+{
+	function fixturePath($fileName) {
+		return dirname(__DIR__) .'/fixtures/'. $fileName .'.json';
+	}
+	function fixture($fileName) {
+		return json_decode(file_get_contents($this->fixturePath($fileName)));
+	}
+
+	function setUp(){
+		$resolver = new RefResolver();
+		$this->schemaUri = 'file://'. $this->fixturePath('Employee');
+		$retriever = new Uri\UriRetriever;
+		$this->schema = $retriever->retrieve($this->schemaUri);
+
+		$refResolver = new RefResolver($retriever);
+		$refResolver->resolve($this->schema, $this->schemaUri);
+
+		$this->data = $this->fixture('employee_instance');
+	}
+
+	function assertValid($data) {
+		$validator = new Validator();
+		$validator->check($data, $this->schema);
+		$this->assertEquals(array(), $validator->getErrors(), print_r($validator->getErrors(), true));
+		$this->assertTrue($validator->isValid());
+	}
+
+		function assertNotValid($data, $errors) {
+		$validator = new Validator();
+		$validator->check($data, $this->schema);
+		$this->assertEquals($errors, $validator->getErrors(), print_r($validator->getErrors(), true));
+		$this->assertFalse($validator->isValid());
+	}
+
+	function testResolvedSchema() {
+		$expectedResolvedSchema = $this->fixture('resolved_Employee_schema');
+		$expectedResolvedSchema->id = $this->schemaUri;
+		$this->assertEquals($expectedResolvedSchema, $this->schema, 'expected resolved schema');
+	}
+
+	function testEmployeeShouldBeValidate() {
+		$this->assertValid($this->data);
+	}
+
+	function testEmployeeMissingOfficeAddress() {
+		unset($this->data->person->office_address);
+
+		$this->assertNotValid(
+			$this->data
+			,array(array(
+		  	 'property' => 'person.office_address'
+	    	,'message'  => 'is missing and it is required'
+	  	))
+		);
+	}
+}

tests/fixtures/Employee.json

@@ -0,0 +1,24 @@
+{
+  "description": "Employee schema inherits from Person.json; Uses custom types from types.json",
+  "extends": "Person.json",
+  "properties": {
+    "person": {
+      "type":"object",
+      "additionalProperties":false,
+      "properties": {
+        "type" :{
+          "enum": ["Employee"]
+        },
+        "department": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 255
+        },
+        "office_address": {
+          "extends" : "types.json#/postal_address",
+          "required": true
+        }
+      }
+    }
+  }
+}

tests/fixtures/Person.json

@@ -0,0 +1,22 @@
+{
+  "description" : "Person schema is abstract base schema for Employee and others; Uses custom types from types.json",
+  "type":"object",
+  "additionalProperties":false,
+  "$schema": "http://json-schema.org/draft-03/schema",
+  "properties": {
+    "person": {
+      "type":"object",
+      "required":true,
+      "properties": {
+        "id": {
+          "extends": "types.json#/id_type",
+          "required": true
+        },
+        "type": {
+          "type": "string",
+          "required": true
+        }
+      }
+    }
+  }
+}

tests/fixtures/employee_instance.json

@@ -0,0 +1,11 @@
+{
+	"person": {
+		"id": 123456
+		,"type": "Employee"
+		,"department": "Business Intelligence"
+		,"office_address": {
+			"street":"Main Avenue 3",
+			"city": "Cubertino"
+		}
+	}
+}

tests/fixtures/resolved_Employee_schema.json

@@ -0,0 +1,47 @@
+{
+  "description" : "Employee schema inherits from Person.json; Uses custom types from types.json",
+  "type":"object",
+  "$schema": "http://json-schema.org/draft-03/schema",
+  "id": "< should be the same absolute URI as Employee.json. Set it manually in your test! >",
+  "additionalProperties":false,
+  "properties": {
+    "person": {
+      "type":"object",
+      "additionalProperties":false,
+      "required":true,
+      "properties": {
+        "id": {
+          "description" : "ID",
+          "type" : "integer",
+          "minimum": 1,
+          "exclusiveMinimum": false,
+          "required": true
+        },
+        "type" :{
+          "type": "string",
+          "required": true,
+          "enum": ["Employee"]
+        },
+        "department": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 255
+        },
+        "office_address": {
+          "type": "object",
+          "required": true,
+          "properties": {
+            "street": {
+              "type":"string",
+              "required": true
+            },
+            "city" : {
+              "type":"string",
+              "required": true
+            }
+          }
+        }
+      }
+    }
+  }
+}

tests/fixtures/types.json

@@ -0,0 +1,23 @@
+{
+  "description" : "custom type definitions",
+  "type":"object",
+  "id_type": {
+    "description" : "ID",
+    "type" : "integer",
+    "minimum": 1,
+    "exclusiveMinimum": false
+  },
+  "postal_address" : {
+  	"type": "object",
+  	"properties": {
+  		"street": {
+  			"type":"string",
+  			"required": true
+  		},
+  		"city" : {
+  			"type":"string",
+  			"required": true
+  		}
+  	}
+  }
+}