Fix type hint check when callback has no type hint (courtesy of @cboden)

reactphp · Dec 9, 2014 · becfcee · becfcee
1 parent 4c05094
commit becfcee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/functions.php b/src/functions.php
@@ -189,7 +189,7 @@ function _checkTypehint(callable $callback, $object)
     $expectedException = $parameters[0];
 
     if (!$expectedException->getClass()) {
-        return false;
+        return true;
     }
 
     return $expectedException->getClass()->isInstance($object);

diff --git a/tests/PromiseTest/PromiseRejectedTestTrait.php b/tests/PromiseTest/PromiseRejectedTestTrait.php
@@ -309,6 +309,26 @@ public function otherwiseShouldInvokeRejectionHandlerForRejectedPromise()
         $adapter->promise()->otherwise($mock);
     }
 
+    /** @test */
+    public function otherwiseShouldInvokeNonTypeHintedRejectionHandlerIfReasonIsAnExceptionForRejectedPromise()
+    {
+        $adapter = $this->getPromiseTestAdapter();
+
+        $exception = new \Exception();
+
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->identicalTo($exception));
+
+        $adapter->reject($exception);
+        $adapter->promise()
+            ->otherwise(function ($reason) use ($mock) {
+                $mock($reason);
+            });
+    }
+
     /** @test */
     public function otherwiseShouldInvokeRejectionHandlerIfReasonMatchesTypehintForRejectedPromise()
     {