[PHPUnitBridge] deprecations not enabled anymore when disabled=0

l-vo · l-vo · commit 6967a11002f3 · 2020-09-01T14:09:36.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']) && filter_var($normalizedConfiguration['disabled'], FILTER_VALIDATE_BOOLEAN)) {
             return self::inDisabledMode();
         }
 
@@ -176,7 +176,7 @@ public static function fromUrlEncodedString($serializedConfiguration)
         }
 
         foreach (['unsilenced', 'direct', 'indirect', 'self', 'other'] as $group) {
-            $verboseOutput[$group] = (bool) $normalizedConfiguration['verbose'];
+            $verboseOutput[$group] = filter_var($normalizedConfiguration['verbose'], FILTER_VALIDATE_BOOLEAN);
         }
 
         if (isset($normalizedConfiguration['quiet']) && \is_array($normalizedConfiguration['quiet'])) {
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ConfigurationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ConfigurationTest.php
@@ -176,10 +176,21 @@ public function testItCanTellWhetherToDisplayAStackTrace()
         $this->assertTrue($configuration->shouldDisplayStackTrace('interesting'));
     }
 
-    public function testItCanBeDisabled()
+    public function provideItCanBeDisabled(): array
     {
-        $configuration = Configuration::fromUrlEncodedString('disabled');
-        $this->assertFalse($configuration->isEnabled());
+        return [
+            ['disabled=1', false],
+            ['disabled=0', true]
+        ];
+    }
+
+    /**
+     * @dataProvider provideItCanBeDisabled
+     */
+    public function testItCanBeDisabled(string $encodedString, bool $expectedEnabled)
+    {
+        $configuration = Configuration::fromUrlEncodedString($encodedString);
+        $this->assertSame($expectedEnabled, $configuration->isEnabled());
     }
 
     public function testItCanBeShushed()
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']) && filter_var($normalizedConfiguration['disabled'], FILTER_VALIDATE_BOOLEAN)) {`
`170`	`170`	`return self::inDisabledMode();`
`171`	`171`	`}`
`172`	`172`
`@@ -176,7 +176,7 @@ public static function fromUrlEncodedString($serializedConfiguration)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`foreach (['unsilenced', 'direct', 'indirect', 'self', 'other'] as $group) {`
`179`		`- $verboseOutput[$group] = (bool) $normalizedConfiguration['verbose'];`
	`179`	`+ $verboseOutput[$group] = filter_var($normalizedConfiguration['verbose'], FILTER_VALIDATE_BOOLEAN);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if (isset($normalizedConfiguration['quiet']) && \is_array($normalizedConfiguration['quiet'])) {`