Read environment variable from superglobals

greg0ire · greg0ire · commit e7e35934d5cc · 2019-06-08T17:25: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
@@ -90,6 +90,11 @@ public static function register($mode = 0)
         }
     }
 
+    public static function registerAndConfigureFromEnvironment()
+    {
+        self::register(self::getModeFromEnvironment());
+    }
+
     public static function collectDeprecations($outputFile)
     {
         $deprecations = [];
@@ -209,12 +214,28 @@ 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;
         }
-        $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/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
`@@ -90,6 +90,11 @@ public static function register($mode = 0)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ public static function registerAndConfigureFromEnvironment()`
	`94`	`+ {`
	`95`	`+ self::register(self::getModeFromEnvironment());`
	`96`	`+ }`
	`97`	`+`
`93`	`98`	`public static function collectDeprecations($outputFile)`
`94`	`99`	`{`
`95`	`100`	`$deprecations = [];`
`@@ -209,12 +214,28 @@ public function shutdown()`
`209`	`214`	`});`
`210`	`215`	`}`
`211`	`216`
	`217`	`+ /**`
	`218`	`+ * @return mixed string\|false`
	`219`	`+ */`
	`220`	`+ private static function getModeFromEnvironment()`
	`221`	`+ {`
	`222`	`+ if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER'])) {`
	`223`	`+ return $_SERVER['SYMFONY_DEPRECATIONS_HELPER'];`
	`224`	`+ }`
	`225`	`+`
	`226`	`+ if (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER'])) {`
	`227`	`+ return $_ENV['SYMFONY_DEPRECATIONS_HELPER'];`
	`228`	`+ }`
	`229`	`+`
	`230`	`+ return getenv('SYMFONY_DEPRECATIONS_HELPER');`
	`231`	`+ }`
	`232`	`+`
`212`	`233`	`private function getConfiguration()`
`213`	`234`	`{`
`214`	`235`	`if (null !== $this->configuration) {`
`215`	`236`	`return $this->configuration;`
`216`	`237`	`}`
`217`		`- $mode = getenv('SYMFONY_DEPRECATIONS_HELPER');`
	`238`	`+ $mode = self::getModeFromEnvironment();`
`218`	`239`	`if ('strict' === $mode) {`
`219`	`240`	`return $this->configuration = Configuration::inStrictMode();`
`220`	`241`	`}`
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();`