Refactor php error collection to it own class

Author: jsor

tests/React/Promise/DeferredProgressTest.php

@@ -319,7 +319,8 @@ public function shouldAllowRejectAfterProgress()
      **/
     public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
-        $this->setErrorHandler();
+        $errorCollector = new ErrorCollector();
+        $errorCollector->register();
 
         $mock = $this->createCallableMock();
         $mock
@@ -342,7 +343,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
 
         $d->progress(1);
 
-        $this->assertError('Invalid $progressHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
-        $this->restoreErrorHandler();
+        $errorCollector->assertCollectedError('Invalid $progressHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
+        $errorCollector->unregister();
     }
 }

tests/React/Promise/DeferredRejectTest.php

@@ -92,7 +92,8 @@ public function shouldForwardReasonWhenCallbackIsNull()
      **/
     public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
-        $this->setErrorHandler();
+        $errorCollector = new ErrorCollector();
+        $errorCollector->register();
 
         $mock = $this->createCallableMock();
         $mock
@@ -113,7 +114,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
 
         $d->reject(1);
 
-        $this->assertError('Invalid $errorHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
-        $this->restoreErrorHandler();
+        $errorCollector->assertCollectedError('Invalid $errorHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
+        $errorCollector->unregister();
     }
 }

tests/React/Promise/DeferredResolveTest.php

@@ -169,7 +169,8 @@ public function shouldForwardValueWhenCallbackIsNull()
      **/
     public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
     {
-        $this->setErrorHandler();
+        $errorCollector = new ErrorCollector();
+        $errorCollector->register();
 
         $mock = $this->createCallableMock();
         $mock
@@ -189,7 +190,7 @@ public function shouldIgnoreNonFunctionsAndTriggerPhpNotice($var)
 
         $d->resolve(1);
 
-        $this->assertError('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
-        $this->restoreErrorHandler();
+        $errorCollector->assertCollectedError('Invalid $fulfilledHandler argument passed to then(), must be null or callable.', E_USER_NOTICE);
+        $errorCollector->unregister();
     }
 }

tests/React/Promise/ErrorCollector.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace React\Promise;
+
+class ErrorCollector
+{
+    private $errors = array();
+
+    public function register()
+    {
+        $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 unregister()
+    {
+        $this->errors = array();
+        restore_error_handler();
+    }
+
+    public function assertCollectedError($errstr, $errno)
+    {
+        foreach ($this->errors as $error) {
+            if ($error['errstr'] === $errstr && $error['errno'] === $errno) {
+                return;
+            }
+        }
+
+        $message = 'Error with level ' . $errno . ' and message "' . $errstr . '" not found in ' . var_export($this->errors, true);
+
+        throw new \PHPUnit_Framework_AssertionFailedError($message);
+    }
+}

tests/React/Promise/TestCase.php

@@ -4,8 +4,6 @@
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
-    private $errors = array();
-
     public function expectCallableExactly($amount)
     {
         $mock = $this->createCallableMock();
@@ -52,32 +50,4 @@ public function invalidCallbackDataProvider()
             'falsey'       => array(0)
         );
     }
-
-    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));
-    }
 }