Add variable path to error output

Author: bighappyface

src/JsonSchema/Constraints/CollectionConstraint.php

@@ -33,7 +33,7 @@ public function check($value, $schema = null, $path = null, $i = null)
         }
 
         // Verify uniqueItems
-        if (isset($schema->uniqueItems)) {
+        if (isset($schema->uniqueItems) && $schema->uniqueItems) {
             $unique = $value;
             if (is_array($value) && count($value)) {
                 $unique = array_map(function($e) { return var_export($e, true); }, $value);

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -121,7 +121,11 @@ protected function validateCommonProperties($value, $schema = null, $path = null
                 // Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]
                 foreach ($schema->required as $required) {
                     if (!property_exists($value, $required)) {
+<<<<<<< HEAD
                         $this->addError($required, "The property " . $required . " is required", 'required');
+=======
+                        $this->addError((!$path) ? $required : "$path.$required", "The property " . $required . " is required", 'required');
+>>>>>>> 9bda789... add variable path
                     }
                 }
             } else if (isset($schema->required) && !is_array($schema->required)) {

tests/JsonSchema/Tests/Constraints/UniqueItemsTest.php

@@ -110,6 +110,49 @@ public function getValidTests()
                     "type": "array",
                     "uniqueItems": true
                 }'
+            ),
+            // below equals the invalid tests, but with uniqueItems set to false
+            array(
+                '[1,2,2]',
+                '{
+                  "type":"array",
+                  "uniqueItems": false
+                }'
+            ),
+            array(
+                '[{"a":"b"},{"a":"c"},{"a":"b"}]',
+                '{
+                  "type":"array",
+                  "uniqueItems": false
+                }'
+            ),
+            array(
+                '[{"foo": {"bar" : {"baz" : true}}}, {"foo": {"bar" : {"baz" : true}}}]',
+                '{
+                    "type": "array",
+                    "uniqueItems": false
+                }'
+            ),
+            array(
+                '[1.0, 1.00, 1]',
+                '{
+                    "type": "array",
+                    "uniqueItems": false
+                }'
+            ),
+            array(
+                '[["foo"], ["foo"]]',
+                '{
+                    "type": "array",
+                    "uniqueItems": false
+                }'
+            ),
+            array(
+                '[{}, [1], true, null, {}, 1]',
+                '{
+                    "type": "array",
+                    "uniqueItems": false
+                }'
             )
         );
     }