[Bridge\PhpUnit] Add "disabled" mode to SYMFONY_DEPRECATIONS_HELPER

nicolas-grekas · nicolas-grekas · commit 13ed5cf8af06 · 2016-03-19T17:25:53.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -19,6 +19,7 @@
 class DeprecationErrorHandler
 {
     const MODE_WEAK = 'weak';
+    const MODE_DISABLED = 'disabled';
 
     private static $isRegistered = false;
 
@@ -39,9 +40,23 @@ 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;
-        }
+
+        $mode = function () use ($mode) {
+            static $memoizedMode = false;
+
+            if (false !== $memoizedMode) {
+                return $memoizedMode;
+            }
+            if (false === $mode) {
+                $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
+            }
+            if (DeprecationErrorHandler::MODE_WEAK !== $mode && (!isset($mode[0]) || '/' !== $mode[0])) {
+                $mode = preg_match('/^[1-9][0-9]*$/', $mode) ? (int) $mode : 0;
+            }
+
+            return $memoizedMode = $mode;
+        };
+
         $deprecations = array(
             'unsilencedCount' => 0,
             'remainingCount' => 0,
@@ -53,7 +68,7 @@ public static function register($mode = 0)
             'other' => array(),
         );
         $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $mode) {
-            if (E_USER_DEPRECATED !== $type) {
+            if (E_USER_DEPRECATED !== $type || DeprecationErrorHandler::MODE_DISABLED === $mode = $mode()) {
                 return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 
@@ -95,13 +110,13 @@ public static function register($mode = 0)
 
                     exit(1);
                 }
-                if ('legacy' !== $group && self::MODE_WEAK !== $mode) {
+                if ('legacy' !== $group && DeprecationErrorHandler::MODE_WEAK !== $mode) {
                     $ref = &$deprecations[$group][$msg]['count'];
                     ++$ref;
                     $ref = &$deprecations[$group][$msg][$class.'::'.$method];
                     ++$ref;
                 }
-            } else {
+            } elseif (DeprecationErrorHandler::MODE_WEAK !== $mode) {
                 $group = 'other';
                 $ref = &$deprecations[$group][$msg]['count'];
                 ++$ref;
@@ -116,7 +131,7 @@ 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) {
@@ -128,9 +143,16 @@ public static function register($mode = 0)
                 $colorize = function ($str) {return $str;};
             }
             register_shutdown_function(function () use ($mode, &$deprecations, $deprecationHandler, $colorize) {
+                $mode = $mode();
+                if (isset($mode[0]) && '/' === $mode[0]) {
+                    return;
+                }
                 $currErrorHandler = set_error_handler('var_dump');
                 restore_error_handler();
 
+                if (DeprecationErrorHandler::MODE_WEAK === $mode) {
+                    $colorize = function ($str) {return $str;};
+                }
                 if ($currErrorHandler !== $deprecationHandler) {
                     echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";
                 }
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`	`+}`