[Bridge\PhpUnit] Add "disabled" mode

nicolas-grekas · nicolas-grekas · commit 74963db0a10a · 2016-03-19T12:01:40.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -21,6 +21,7 @@ class DeprecationErrorHandler
     const MODE_WEAK = 'weak';
 
     private static $isRegistered = false;
+    private static $mode;
 
     /**
      * Registers and configures the deprecation handler.
@@ -39,9 +40,8 @@ public static function register($mode = 0)
         if (self::$isRegistered) {
             return;
         }
-        if (self::MODE_WEAK !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
-            $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
-        }
+        self::$mode = $mode;
+
         $deprecations = array(
             'unsilencedCount' => 0,
             'remainingCount' => 0,
@@ -52,11 +52,12 @@ public static function register($mode = 0)
             'legacy' => array(),
             'other' => array(),
         );
-        $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $mode) {
+        $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations) {
             if (E_USER_DEPRECATED !== $type) {
                 return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 
+            $mode = self::getMode();
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
 
             $i = count($trace);
@@ -101,7 +102,7 @@ public static function register($mode = 0)
                     $ref = &$deprecations[$group][$msg][$class.'::'.$method];
                     ++$ref;
                 }
-            } else {
+            } elseif (self::MODE_WEAK !== $mode) {
                 $group = 'other';
                 $ref = &$deprecations[$group][$msg]['count'];
                 ++$ref;
@@ -116,18 +117,22 @@ public static function register($mode = 0)
                 restore_error_handler();
                 self::register($mode);
             }
-        } elseif (!isset($mode[0]) || '/' !== $mode[0]) {
+        } else {
             self::$isRegistered = true;
-            if (self::hasColorSupport()) {
-                $colorize = function ($str, $red) {
-                    $color = $red ? '41;37' : '43;30';
+            register_shutdown_function(function () use (&$deprecations, $deprecationHandler) {
+                $mode = self::getMode();
+                if (isset($mode[0]) && '/' === $mode[0]) {
+                    return;
+                }
+                if (DeprecationErrorHandler::MODE_WEAK !== $mode && self::hasColorSupport()) {
+                    $colorize = function ($str, $red) {
+                        $color = $red ? '41;37' : '43;30';
 
-                    return "\x1B[{$color}m{$str}\x1B[0m";
-                };
-            } else {
-                $colorize = function ($str) {return $str;};
-            }
-            register_shutdown_function(function () use ($mode, &$deprecations, $deprecationHandler, $colorize) {
+                        return "\x1B[{$color}m{$str}\x1B[0m";
+                    };
+                } else {
+                    $colorize = function ($str) {return $str;};
+                }
                 $currErrorHandler = set_error_handler('var_dump');
                 restore_error_handler();
 
@@ -169,6 +174,21 @@ public static function register($mode = 0)
         }
     }
 
+    private static function getMode()
+    {
+        if (false !== self::$mode) {
+            return self::$mode;
+        }
+
+        $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
+
+        if (self::MODE_WEAK !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
+            $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
+        }
+
+        return self::$mode = $mode;
+    }
+
     private static function hasColorSupport()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -24,4 +24,6 @@
     AnnotationRegistry::registerLoader('class_exists');
 }
 
-DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
+if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
+    DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
+}

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@`
`24`	`24`	`AnnotationRegistry::registerLoader('class_exists');`
`25`	`25`	`}`
`26`	`26`
`27`		`-DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));`
	`27`	`+if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {`
	`28`	`+ DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));`
	`29`	`+}`