Merge pull request #27958 from matt-allan/restore-getenv-support

[5.8] Allow retrieving env variables with getenv
laravel · Mar 21, 2019 · 3ee639d · 3ee639d
2 parents 03e73f8 + be22b61
commit 3ee639d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -8,6 +8,7 @@
 use Dotenv\Environment\DotenvFactory;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\HigherOrderTapProxy;
+use Dotenv\Environment\Adapter\PutenvAdapter;
 use Dotenv\Environment\Adapter\EnvConstAdapter;
 use Dotenv\Environment\Adapter\ServerConstAdapter;
 
@@ -642,7 +643,7 @@ function env($key, $default = null)
         static $variables;
 
         if ($variables === null) {
-            $variables = (new DotenvFactory([new EnvConstAdapter, new ServerConstAdapter]))->createImmutable();
+            $variables = (new DotenvFactory([new EnvConstAdapter, new PutEnvAdapter, new ServerConstAdapter]))->createImmutable();
         }
 
         return Option::fromValue($variables->get($key))

diff --git a/tests/Foundation/Bootstrap/LoadEnvironmentVariablesTest.php b/tests/Foundation/Bootstrap/LoadEnvironmentVariablesTest.php
@@ -37,6 +37,9 @@ public function testCanLoad()
         (new LoadEnvironmentVariables)->bootstrap($this->getAppMock('.env'));
 
         $this->assertSame('BAR', env('FOO'));
+        $this->assertSame('BAR', getenv('FOO'));
+        $this->assertSame('BAR', $_ENV['FOO']);
+        $this->assertSame('BAR', $_SERVER['FOO']);
     }
 
     public function testCanFailSilent()