Relationship validator callback patches, fixes #10

Author: lindyhopchris

src/Validator/Relationships/HasManyValidator.php

@@ -257,7 +257,7 @@ protected function validate($value)
             $this->validateIdentifier($identifier, $key);
         }
 
-        if ($this->hasCallback()) {
+        if ($this->getErrors()->isEmpty() && $this->hasCallback()) {
             $this->validateCallback($data);
         }
     }

src/Validator/Relationships/HasOneValidator.php

@@ -265,7 +265,7 @@ protected function validate($value)
         }
 
         // check the callback, if one exists.
-        if ($this->hasCallback() && false == call_user_func($this->getCallback(), $data)) {
+        if ($this->getErrors()->isEmpty() && $this->hasCallback() && false == call_user_func($this->getCallback(), $data)) {
             $this->error(static::ERROR_NOT_FOUND, '/' . Relationship::DATA);
         }
     }

test/Validator/Relationships/HasManyValidatorTest.php

@@ -195,4 +195,18 @@ public function testCallbackInvalidIndexes()
         $this->assertEquals('/data/1', $error->source()->getPointer());
     }
 
+    /**
+     * @depends testCallback
+     */
+    public function testCallbackNotInvokedIfCollectionIsInvalid()
+    {
+        $this->validator->setTypes(static::TYPE_A);
+
+        $this->validator->setCallback(function () {
+            $this->fail('Not expecting callback to be invoked.');
+        });
+
+        $this->assertFalse($this->validator->isValid($this->input));
+    }
+
 }

…Relationships/BelongsToValidatorTest.php …or/Relationships/HasOneValidatorTest.phptest/Validator/Relationships/BelongsToValidatorTest.php renamed to test/Validator/Relationships/HasOneValidatorTest.php test/Validator/Relationships/BelongsToValidatorTest.php renamed to test/Validator/Relationships/HasOneValidatorTest.php

@@ -22,7 +22,7 @@
 use CloudCreativity\JsonApi\Object\ResourceIdentifier\ResourceIdentifier;
 use CloudCreativity\JsonApi\Validator\ValidatorTestCase;
 
-class BelongsToValidatorTest extends ValidatorTestCase
+class HasOneValidatorTest extends ValidatorTestCase
 {
 
     const TYPE = 'foo';
@@ -177,4 +177,19 @@ public function testCallbackInvalid()
         $this->assertEquals(404, $error->getStatus());
         $this->assertEquals('/data', $error->source()->getPointer());
     }
+
+    /**
+     * @depends testCallback
+     */
+    public function testCallbackNotInvokedForInvalidIdentifier()
+    {
+        $callback = function () {
+            $this->fail('Not expecting callback to be invoked.');
+        };
+
+        $this->valid->{Relationship::DATA}->{ResourceIdentifier::TYPE} = static::INVALID_TYPE;
+
+        $this->validator->setCallback($callback);
+        $this->assertFalse($this->validator->isValid($this->valid));
+    }
 }