Merge pull request #6 from Superbalist/switch-to-error-arrays

Switch to just use the json serializable array of schema errors
Superbalist · Sep 14, 2017 · 28ca107 · 28ca107
2 parents 4d9c20c + 678b2b9
commit 28ca107
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.3 - 2017-07-20
+
+* JSONValidator should just pass the json serializable validation result through
+
 ## 4.0.2 - 2017-07-20
 
 * Fix events not being validated correctly when attribute injectors are used
@@ -35,4 +39,4 @@
 
 ## 1.0.0 - 2017-01-27
 
-* Initial release
+* Initial release
diff --git a/src/Validators/JSONSchemaEventValidator.php b/src/Validators/JSONSchemaEventValidator.php
@@ -41,11 +41,7 @@ public function validate(EventInterface $event)
         if ($schemaValidator->passes()) {
             return new ValidationResult($this, $event, true);
         } else {
-            $errors = [];
-            foreach ($schemaValidator->errors() as $error) {
-                /* @var ValidationError $error */
-                $errors[] = $error->getMessage();
-            }
+            $errors = $schemaValidator->errors();
             return new ValidationResult($this, $event, false, $errors);
         }
     }

diff --git a/tests/Validators/JSONSchemaEventValidatorTest.php b/tests/Validators/JSONSchemaEventValidatorTest.php
@@ -58,8 +58,8 @@ public function testValidateWhenJsonIsInvalid()
         $this->assertFalse($result->passes());
         $this->assertTrue($result->fails());
         $this->assertEquals(
-            ['Required properties missing: ["user"]'],
-            $result->errors()
+            'Required properties missing: ["user"]',
+            $result->errors()[0]->getMessage()
         );
     }