fix merge

JustTSK · JustTSK · commit 8be9120b4f89 · 2015-12-14T12:26:14.000-08:00
diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -121,11 +121,7 @@ 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)) {

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,7 @@ protected function validateCommonProperties($value, $schema = null, $path = null`
`121`	`121`	`// Draft 4 - Required is an array of strings - e.g. "required": ["foo", ...]`
`122`	`122`	`foreach ($schema->required as $required) {`
`123`	`123`	`if (!property_exists($value, $required)) {`
`124`		`-<<<<<<< HEAD`
`125`		`- $this->addError($required, "The property " . $required . " is required", 'required');`
`126`		`-=======`
`127`	`124`	`$this->addError((!$path) ? $required : "$path.$required", "The property " . $required . " is required", 'required');`
`128`		`->>>>>>> 9bda789... add variable path`
`129`	`125`	`}`
`130`	`126`	`}`
`131`	`127`	`} else if (isset($schema->required) && !is_array($schema->required)) {`