Trigger a E_USER_NOTICE for invalid arguments passed to then()

Author: jsor

phpunit.xml.dist

@@ -4,7 +4,7 @@
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
+         convertNoticesToExceptions="false"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"

src/React/Promise/Deferred.php

@@ -27,6 +27,10 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
                 }
             };
         } else {
+            if (null !== $progressHandler) {
+                trigger_error('Invalid $progressHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+            }
+
             $progHandler = array($deferred, 'progress');
         }
 

src/React/Promise/FulfilledPromise.php

@@ -18,6 +18,8 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
 
             if (is_callable($fulfilledHandler)) {
                 $result = call_user_func($fulfilledHandler, $result);
+            } elseif (null !== $fulfilledHandler) {
+                trigger_error('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
             }
 
             return Util::promiseFor($result);

src/React/Promise/RejectedPromise.php

@@ -15,6 +15,10 @@ public function then($fulfilledHandler = null, $errorHandler = null, $progressHa
     {
         try {
             if (!is_callable($errorHandler)) {
+                if (null !== $errorHandler) {
+                    trigger_error('Invalid $errorHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+                }
+
                 return new RejectedPromise($this->reason);
             }
 

tests/React/Promise/DeferredProgressTest.php

@@ -317,8 +317,10 @@ public function shouldAllowRejectAfterProgress()
      * @test
      * @dataProvider typesDataProvider
      **/
-    public function shouldIgnoreNonFunctions($var, $desc)
+    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var, $desc)
     {
+        $this->setErrorHandler();
+
         $mock = $this->createCallableMock();
         $mock
             ->expects($this->once())
@@ -339,5 +341,8 @@ public function shouldIgnoreNonFunctions($var, $desc)
             );
 
         $d->progress(1);
+
+        $this->assertError('Invalid $progressHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->restoreErrorHandler();
     }
 }

tests/React/Promise/DeferredRejectTest.php

@@ -90,8 +90,10 @@ public function shouldForwardReasonWhenCallbackIsNull()
      * @test
      * @dataProvider typesDataProvider
      **/
-    public function shouldIgnoreNonFunctions($var, $desc)
+    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var, $desc)
     {
+        $this->setErrorHandler();
+
         $mock = $this->createCallableMock();
         $mock
             ->expects($this->once())
@@ -110,5 +112,8 @@ public function shouldIgnoreNonFunctions($var, $desc)
             );
 
         $d->reject(1);
+
+        $this->assertError('Invalid $errorHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->restoreErrorHandler();
     }
 }

tests/React/Promise/DeferredResolveTest.php

@@ -167,8 +167,10 @@ public function shouldForwardValueWhenCallbackIsNull()
      * @test
      * @dataProvider typesDataProvider
      **/
-    public function shouldIgnoreNonFunctions($var, $desc)
+    public function shouldIgnoreNonFunctionsAndTriggerPHPNotice($var, $desc)
     {
+        $this->setErrorHandler();
+
         $mock = $this->createCallableMock();
         $mock
             ->expects($this->once())
@@ -186,5 +188,8 @@ public function shouldIgnoreNonFunctions($var, $desc)
             );
 
         $d->resolve(1);
+
+        $this->assertError('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', \E_USER_NOTICE);
+        $this->restoreErrorHandler();
     }
 }

tests/React/Promise/TestCase.php

@@ -4,6 +4,8 @@
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
+    private $errors = array();
+
     public function expectCallableExactly($amount)
     {
         $mock = $this->createCallableMock();
@@ -50,4 +52,32 @@ public function typesDataProvider()
             array(0,             'falsey')
         );
     }
+
+    public function setErrorHandler()
+    {
+        $errors = array();
+
+        set_error_handler(function ($errno, $errstr, $errfile, $errline, $errcontext) use (&$errors) {
+            $errors[] = compact('errno', 'errstr', 'errfile', 'errline', 'errcontext');
+        });
+
+        $this->errors = &$errors;
+    }
+
+    public function restoreErrorHandler()
+    {
+        $this->errors = array();
+        restore_error_handler();
+    }
+
+    public function assertError($errstr, $errno)
+    {
+        foreach ($this->errors as $error) {
+            if ($error['errstr'] === $errstr && $error['errno'] === $errno) {
+                return;
+            }
+        }
+
+        $this->fail('Error with level ' . $errno . ' and message "' . $errstr . '" not found in ',  var_export($this->errors, true));
+    }
 }