Rely on memoized variable

greg0ire · greg0ire · commit 14cd6d6ad9da · 2018-12-30T10:18:26.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -57,8 +57,10 @@ public static function register($mode = 0)
             return;
         }
 
-        $deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use ($mode) {
-            $mode = self::getMode($mode);
+        self::computeMode($mode);
+
+        $deprecationHandler = function ($type, $msg, $file, $line, $context = array()) {
+            $mode = self::$mode;
             if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || self::MODE_DISABLED === $mode) {
                 $ErrorHandler = self::utilPrefix().'ErrorHandler';
 
@@ -143,8 +145,8 @@ public static function register($mode = 0)
             }
         } else {
             self::$isRegistered = true;
-            register_shutdown_function(function () use ($mode, $deprecationHandler) {
-                $mode = self::getMode($mode);
+            register_shutdown_function(function () use ($deprecationHandler) {
+                $mode = self::$mode;
                 if (isset($mode[0]) && '/' === $mode[0]) {
                     return;
                 }
@@ -251,13 +253,11 @@ private static function hasColorSupport()
 
     /**
      * @param mixed $mode
-     *
-     * @return mixed
      */
-    private static function getMode($mode)
+    private static function computeMode($mode)
     {
         if (false !== self::$mode) {
-            return self::$mode;
+            return;
         }
         if (false === $mode) {
             $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
@@ -270,7 +270,7 @@ private static function getMode($mode)
             $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
         }
 
-        return self::$mode = $mode;
+        self::$mode = $mode;
     }
 
     /**
