Ignore non-function callback arguments

Author: jsor

src/React/Promise/Deferred.php

@@ -18,7 +18,7 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
 
         $deferred = new static();
 
-        if ($progressHandler) {
+        if (is_callable($progressHandler)) {
             $progHandler = function ($update) use ($deferred, $progressHandler) {
                 try {
                     $deferred->progress(call_user_func($progressHandler, $update));

src/React/Promise/FulfilledPromise.php

@@ -15,7 +15,8 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
     {
         try {
             $result = $this->result;
-            if ($fulfilledHandler) {
+
+            if (is_callable($fulfilledHandler)) {
                 $result = call_user_func($fulfilledHandler, $result);
             }
 

src/React/Promise/RejectedPromise.php

@@ -14,7 +14,7 @@ public function __construct($reason = null)
     public function then($fulfilledHandler = null, $errorHandler = null, $progressHandler = null)
     {
         try {
-            if (!$errorHandler) {
+            if (!is_callable($errorHandler)) {
                 return new RejectedPromise($this->reason);
             }
 

tests/React/Promise/DeferredProgressTest.php

@@ -312,4 +312,32 @@ public function shouldAllowRejectAfterProgress()
             ->resolver()
             ->reject(2);
     }
+
+    /**
+     * @test
+     * @dataProvider typesDataProvider
+     **/
+    public function shouldIgnoreNonFunctions($var, $desc)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->identicalTo(1));
+
+        $d = new Deferred();
+        $d
+            ->then(
+                null,
+                null,
+                $var
+            )
+            ->then(
+                $this->expectCallableNever(),
+                $this->expectCallableNever(),
+                $mock
+            );
+
+        $d->progress(1);
+    }
 }

tests/React/Promise/DeferredRejectTest.php

@@ -85,4 +85,30 @@ public function shouldForwardReasonWhenCallbackIsNull()
 
         $d->reject(1);
     }
+
+    /**
+     * @test
+     * @dataProvider typesDataProvider
+     **/
+    public function shouldIgnoreNonFunctions($var, $desc)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->identicalTo(1));
+
+        $d = new Deferred();
+        $d
+            ->then(
+                null,
+                $var
+            )
+            ->then(
+                $this->expectCallableNever(),
+                $mock
+            );
+
+        $d->reject(1);
+    }
 }

tests/React/Promise/DeferredResolveTest.php

@@ -162,4 +162,29 @@ public function shouldForwardValueWhenCallbackIsNull()
 
         $d->resolve(1);
     }
+
+    /**
+     * @test
+     * @dataProvider typesDataProvider
+     **/
+    public function shouldIgnoreNonFunctions($var, $desc)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->identicalTo(1));
+
+        $d = new Deferred();
+        $d
+            ->then(
+                $var
+            )
+            ->then(
+                $mock,
+                $this->expectCallableNever()
+            );
+
+        $d->resolve(1);
+    }
 }

tests/React/Promise/TestCase.php

@@ -38,4 +38,16 @@ public function createCallableMock()
     {
         return $this->getMock('React\\Promise\Stub\CallableStub');
     }
+
+    public function typesDataProvider()
+    {
+        return array(
+            array('',            'empty string'),
+            array(true,          'true'),
+            array(false,         'false'),
+            array(new \stdClass, 'object'),
+            array(1,             'truthy'),
+            array(0,             'falsey')
+        );
+    }
 }