[PHPUnitBridge] deprecations not enabled anymore when disabled=0

l-vo · l-vo · commit 76cf3d2bcd65 · 2020-08-31T22:38:31.000+02:00
Allow to pass 0 or 1 to disabled to be consistent with "verbose" key behavior
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -49,7 +49,7 @@ public function __construct()
      * Registers and configures the deprecation handler.
      *
      * The mode is a query string with options:
-     *  - "disabled" to disable the deprecation handler
+     *  - "disabled" to enable/disable the deprecation handler
      *  - "verbose" to enable/disable displaying the deprecation report
      *  - "max" to configure the number of deprecations to allow before exiting with a non-zero
      *    status code; it's an array with keys "total", "self", "direct" and "indirect"
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -166,7 +166,7 @@ public static function fromUrlEncodedString($serializedConfiguration)
             }
         }
 
-        if (isset($normalizedConfiguration['disabled'])) {
+        if (isset($normalizedConfiguration['disabled']) && '0' !== $normalizedConfiguration['disabled']) {
             return self::inDisabledMode();
         }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_0.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_0.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test DeprecationErrorHandler in default mode
+--FILE--
+<?php
+
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'disabled=0');
+putenv($k);
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+
+@trigger_error('root deprecation', E_USER_DEPRECATED);
+
+eval(<<<'EOPHP'
+namespace PHPUnit\Util;
+
+class Test
+{
+    public static function getGroups()
+    {
+        return array();
+    }
+}
+EOPHP
+);
+?>
+--EXPECTF--
+Other deprecation notices (1)
+
+  1x: root deprecation
+
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_1.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_1.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test DeprecationErrorHandler in default mode
+--FILE--
+<?php
+
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'disabled=1');
+putenv($k);
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+
+@trigger_error('root deprecation', E_USER_DEPRECATED);
+
+eval(<<<'EOPHP'
+namespace PHPUnit\Util;
+
+class Test
+{
+    public static function getGroups()
+    {
+        return array();
+    }
+}
+EOPHP
+);
+?>
+--EXPECTF--
+

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct()`
`49`	`49`	`* Registers and configures the deprecation handler.`
`50`	`50`	`*`
`51`	`51`	`* The mode is a query string with options:`
`52`		`- * - "disabled" to disable the deprecation handler`
	`52`	`+ * - "disabled" to enable/disable the deprecation handler`
`53`	`53`	`* - "verbose" to enable/disable displaying the deprecation report`
`54`	`54`	`* - "max" to configure the number of deprecations to allow before exiting with a non-zero`
`55`	`55`	`* status code; it's an array with keys "total", "self", "direct" and "indirect"`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public static function fromUrlEncodedString($serializedConfiguration)`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- if (isset($normalizedConfiguration['disabled'])) {`
	`169`	`+ if (isset($normalizedConfiguration['disabled']) && '0' !== $normalizedConfiguration['disabled']) {`
`170`	`170`	`return self::inDisabledMode();`
`171`	`171`	`}`
`172`	`172`