bug symfony#30490 Don't resolve the Deprecation error handler mode until a deprecation is triggered (Emmanuel BORGES)

nicolas-grekas · nicolas-grekas · commit bfcc607b189b · 2019-03-08T18:11:35.000+01:00
This PR was squashed before being merged into the 4.2 branch (closes symfony#30490). Discussion ---------- Don't resolve the Deprecation error handler mode until a deprecation is triggered | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#30047 | License | MIT Don't resolve the Deprecation error handler mode until a deprecation is triggered Commits ------- f3a5b74 Don't resolve the Deprecation error handler mode until a deprecation is triggered
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -105,8 +105,7 @@ public static function register($mode = 0)
             'remaining vendor' => array(),
         ];
         $deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
-            $mode = $getMode();
-            if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
+            if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
                 $ErrorHandler = $UtilPrefix.'ErrorHandler';
 
                 return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
