Clarify source of schema validation errors

erayd · erayd · commit 1ad86c165b27 · 2017-02-23T11:58:49.000+13:00
diff --git a/src/JsonSchema/Constraints/SchemaConstraint.php b/src/JsonSchema/Constraints/SchemaConstraint.php
@@ -75,7 +75,12 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =
             $validator = new Validator(new Factory($schemaStorage, null, self::CHECK_MODE_TYPE_CAST));
             $validator->validate($validationSchema, $schemaStorage->getSchema($schemaSpec));
             if (!$validator->isValid()) {
-                $this->addErrors($validator->getErrors());
+                $validationErrors = array_map(function ($error) {
+                    $error['message'] = 'Schema validation: ' . $error['message'];
+
+                    return $error;
+                }, $validator->getErrors());
+                $this->addErrors($validationErrors);
                 $this->addError($path, 'Schema is not valid', 'schema');
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,12 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $i =`
`75`	`75`	`$validator = new Validator(new Factory($schemaStorage, null, self::CHECK_MODE_TYPE_CAST));`
`76`	`76`	`$validator->validate($validationSchema, $schemaStorage->getSchema($schemaSpec));`
`77`	`77`	`if (!$validator->isValid()) {`
`78`		`- $this->addErrors($validator->getErrors());`
	`78`	`+ $validationErrors = array_map(function ($error) {`
	`79`	`+ $error['message'] = 'Schema validation: ' . $error['message'];`
	`80`	`+`
	`81`	`+ return $error;`
	`82`	`+ }, $validator->getErrors());`
	`83`	`+ $this->addErrors($validationErrors);`
`79`	`84`	`$this->addError($path, 'Schema is not valid', 'schema');`
`80`	`85`	`}`
`81`	`86`	`}`