Read environment variable from superglobals

greg0ire · greg0ire · commit 1fe6eb2def50 · 2019-06-09T21:56:10.000+02:00
The Dotenv component has recently been switched to using superglobals instead of putenv(). Let us support both and give priority to superglobals. Closes #31857
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -91,6 +91,11 @@ public static function register($mode = 0)
         }
     }
 
+    public static function registerAndConfigureFromEnvironment()
+    {
+        self::register(self::getModeFromEnvironment());
+    }
+
     public static function collectDeprecations($outputFile)
     {
         $deprecations = [];
@@ -210,13 +215,29 @@ public function shutdown()
         });
     }
 
+    /**
+     * @return mixed string|false
+     */
+    private static function getModeFromEnvironment()
+    {
+        if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER'])) {
+            return $_SERVER['SYMFONY_DEPRECATIONS_HELPER'];
+        }
+
+        if (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER'])) {
+            return $_ENV['SYMFONY_DEPRECATIONS_HELPER'];
+        }
+
+        return getenv('SYMFONY_DEPRECATIONS_HELPER');
+    }
+
     private function getConfiguration()
     {
         if (null !== $this->configuration) {
             return $this->configuration;
         }
         if (false === $mode = $this->mode) {
-            $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');
+            $mode = self::getModeFromEnvironment();
         }
         if ('strict' === $mode) {
             return $this->configuration = Configuration::inStrictMode();
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test DeprecationErrorHandler in weak mode
+Test DeprecationErrorHandler in disabled mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
+$_SERVER['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_env_superglobal.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test DeprecationErrorHandler in disabled mode (via putenv)
+--FILE--
+<?php
+
+$_ENV['SYMFONY_DEPRECATIONS_HELPER'] = 'disabled';
+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';
+
+echo (int) set_error_handler('var_dump');
+echo (int) class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler', false);
+
+?>
+--EXPECTF--
+00
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_putenv.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled_from_putenv.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test DeprecationErrorHandler in disabled mode (via putenv)
+--FILE--
+<?php
+
+putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
+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';
+
+echo (int) set_error_handler('var_dump');
+echo (int) class_exists('Symfony\Bridge\PhpUnit\DeprecationErrorHandler', false);
+
+?>
+--EXPECTF--
+00
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -35,6 +35,16 @@
     }
 }
 
-if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
-    DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
+if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER']) && 'disabled' === $_SERVER['SYMFONY_DEPRECATIONS_HELPER']) {
+    return;
+}
+
+if (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER']) && 'disabled' === $_ENV['SYMFONY_DEPRECATIONS_HELPER']) {
+    return;
 }
+
+if ('disabled' === getenv('SYMFONY_DEPRECATIONS_HELPER')) {
+    return;
+}
+
+DeprecationErrorHandler::registerAndConfigureFromEnvironment();

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,16 @@`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {`
`39`		`- DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));`
	`38`	`+if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER']) && 'disabled' === $_SERVER['SYMFONY_DEPRECATIONS_HELPER']) {`
	`39`	`+ return;`
	`40`	`+}`
	`41`	`+`
	`42`	`+if (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER']) && 'disabled' === $_ENV['SYMFONY_DEPRECATIONS_HELPER']) {`
	`43`	`+ return;`
`40`	`44`	`}`
	`45`	`+`
	`46`	`+if ('disabled' === getenv('SYMFONY_DEPRECATIONS_HELPER')) {`
	`47`	`+ return;`
	`48`	`+}`
	`49`	`+`
	`50`	`+DeprecationErrorHandler::registerAndConfigureFromEnvironment();`