Read environment variable from superglobals

greg0ire · greg0ire · commit 936cb7d9d88a · 2019-06-08T17:13:15.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,19 @@ public static function register($mode = 0)
         }
     }
 
+    /**
+     * @return bool
+     */
+    public static function isEnabled()
+    {
+        return self::getModeFromEnvironment() !== 'disabled';
+    }
+
+    public static function registerAndConfigureFromEnvironment()
+    {
+        self::register(self::getModeFromEnvironment());
+    }
+
     public static function collectDeprecations($outputFile)
     {
         $deprecations = [];
@@ -209,12 +222,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/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -35,6 +35,6 @@
     }
 }
 
-if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
-    DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
+if (DeprecationErrorHandler::isEnabled()) {
+    DeprecationErrorHandler::registerAndConfigureFromEnvironment();
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {`
`39`		`- DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));`
	`38`	`+if (DeprecationErrorHandler::isEnabled()) {`
	`39`	`+ DeprecationErrorHandler::registerAndConfigureFromEnvironment();`
`40`	`40`	`}`