Added property name in draft-3 required error (#432)

jsonrainbow · Jun 6, 2017 · 024f3d8 · 024f3d8
1 parent 5dcbe1d
commit 024f3d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/JsonSchema/ConstraintError.php b/src/JsonSchema/ConstraintError.php
@@ -43,7 +43,6 @@ class ConstraintError extends Enum
     const NOT = 'not';
     const ONE_OF = 'oneOf';
     const REQUIRED = 'required';
-    const REQUIRED_D3 = 'selfRequired';
     const REQUIRES = 'requires';
     const PATTERN = 'pattern';
     const PREGEX_INVALID = 'pregrex';
@@ -93,7 +92,6 @@ public function getMessage()
             self::NOT => 'Matched a schema which it should not',
             self::ONE_OF => 'Failed to match exactly one schema',
             self::REQUIRED => 'The property %s is required',
-            self::REQUIRED_D3 => 'Is missing and it is required',
             self::REQUIRES => 'The presence of the property %s requires that %s also be present',
             self::PATTERN => 'Does not match the regex pattern %s',
             self::PREGEX_INVALID => 'The pattern %s is invalid',

diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -144,7 +144,9 @@ protected function validateCommonProperties(&$value, $schema = null, JsonPointer
             } elseif (isset($schema->required) && !is_array($schema->required)) {
                 // Draft 3 - Required attribute - e.g. "foo": {"type": "string", "required": true}
                 if ($schema->required && $value instanceof self) {
-                    $this->addError(ConstraintError::REQUIRED_D3(), $path);
+                    $propertyPaths = $path->getPropertyPaths();
+                    $propertyName = end($propertyPaths);
+                    $this->addError(ConstraintError::REQUIRED(), $path, array('property' => $propertyName));
                 }
             }
         }