bug #24681 Fix isolated error handling (alexpott)

nicolas-grekas · nicolas-grekas · commit 107705abd3ad · 2017-10-25T10:01:09.000+02:00
This PR was squashed before being merged into the 3.3 branch (closes #24681). Discussion ---------- Fix isolated error handling | Q | A | ------------- | --- | Branch? | 3.3  | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...   Fixes \Symfony\Bridge\PhpUnit\Tests\ProcessIsolationTest on PHP5.5 and PHP5.6 and (probably) HHVM. Commits ------- b1a2205 Fix isolated error handling
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -251,15 +251,16 @@ public static function collectDeprecations($outputFile)
         $deprecations = array();
         $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, &$previousErrorHandler) {
             if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
-                return $previousErrorHandler ? $previousErrorHandler($type, $msg, $file, $line, $context) : false;
+                if ($previousErrorHandler) {
+                    return $previousErrorHandler($type, $msg, $file, $line, $context);
+                }
+
+                $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
+
+                return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
             $deprecations[] = array(error_reporting(), $msg);
         });
-        // This can be registered before the PHPUnit error handler.
-        if (!$previousErrorHandler) {
-            $UtilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\';
-            $previousErrorHandler = $UtilPrefix.'ErrorHandler::handleError';
-        }
 
         register_shutdown_function(function () use ($outputFile, &$deprecations) {
             file_put_contents($outputFile, serialize($deprecations));
