Read environment variable from superglobals

greg0ire · greg0ire · commit afe721e87a77 · 2019-06-08T12:27:57.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
@@ -210,14 +210,32 @@ public function shutdown()
         });
     }
 
+    /**
+     * @return mixed string|false
+     */
+    private function getModeFromEnvironment()
+    {
+        if (false !== $this->mode) {
+            return $this->mode;
+        }
+
+        if (isset($_SERVER['SYMFONY_DEPRECATIONS_HELPER'])) {
+            return $this->mode = $_SERVER['SYMFONY_DEPRECATIONS_HELPER'];
+        }
+
+        if (isset($_ENV['SYMFONY_DEPRECATIONS_HELPER'])) {
+            return $this->mode = $_ENV['SYMFONY_DEPRECATIONS_HELPER'];
+        }
+
+        return $this->mode = 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 = $this->getModeFromEnvironment();
         if ('strict' === $mode) {
             return $this->configuration = Configuration::inStrictMode();
         }
