Refactor Callback assert to use only callbacks

Author: ivank

src/Assert/Callback.php

@@ -3,7 +3,7 @@
 namespace Harp\Validate\Assert;
 
 use Harp\Validate\Error;
-use InvalidArgumentException;
+use Closure;
 
 /**
  * Assert that the result of a given callback is true. You can thus use php's native validation functions.
@@ -25,12 +25,8 @@ class Callback extends AbstractAssertion
      * @param mixed  $callback
      * @param string $message
      */
-    public function __construct($name, $callback, $message = ':name is invalid')
+    public function __construct($name, Closure $callback, $message = ':name is invalid')
     {
-        if (! is_callable($callback)) {
-            throw new InvalidArgumentException('Callback should be callable');
-        }
-
         $this->callback = $callback;
 
         parent::__construct($name, $message);
@@ -53,7 +49,9 @@ public function execute($subject)
         if ($this->issetProperty($subject, $this->getName())) {
             $value = $this->getProperty($subject, $this->getName());
 
-            if (! call_user_func($this->callback, $value)) {
+            $callback = $this->callback;
+
+            if (! $callback($subject, $value)) {
                 return new Error($this->getMessage(), $this->getName());
             }
         }

tests/src/Assert/CallbackTest.php

@@ -12,17 +12,11 @@ class CallbackTest extends AbstractTestCase
 {
     public function dataExecute()
     {
-        $closure = function($value) {
-            return $value === 'test12';
-        };
-
         return [
-            ['10', 'is_numeric', true],
-            ['black', 'is_numeric', 'test is invalid'],
-            [10, 'is_int', true],
-            ['black', 'is_int', 'test is invalid'],
-            ['test12', $closure, true],
-            ['test122', $closure, 'test is invalid'],
+            ['10', function ($subject) {return $subject->test === '10';}, true],
+            ['black', function ($subject, $value) {return $value === 'black';}, true],
+            ['black', function () {return true;}, true],
+            ['black', function () {return false;}, 'test is invalid'],
         ];
     }
 
@@ -43,14 +37,11 @@ public function testExecute($value, $callback, $expected)
      */
     public function testConstruct()
     {
-        $assertion = new Callback('test', 'is_numeric', 'custom message');
+        $closure = function ($subject) {return $subject['test'] === '10';};
+        $assertion = new Callback('test', $closure, 'custom message');
 
-        $this->assertEquals('is_numeric', $assertion->getCallback());
+        $this->assertEquals($closure, $assertion->getCallback());
         $this->assertEquals('test', $assertion->getName());
         $this->assertEquals('custom message', $assertion->getMessage());
-
-        $this->setExpectedException('InvalidArgumentException');
-
-        new Callback('test', 'invalid callback');
     }
 }