[2.x] Overrides existing variables when loading encrypted environment…

… files (#144) * create mutable variables * Do not pass secrets to fpm
laravel · Nov 28, 2022 · 887890d · 887890d
1 parent 45efd88
commit 887890d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Runtime/Environment.php b/src/Runtime/Environment.php
@@ -158,7 +158,7 @@ public function loadEnvironment()
     {
         fwrite(STDERR, 'Loading decrypted environment variables.'.PHP_EOL);
 
-        Dotenv::createImmutable($this->writePath, $this->environmentFile)->load();
+        Dotenv::createMutable($this->writePath, $this->environmentFile)->load();
     }
 
     /**

diff --git a/stubs/fpmRuntime.php b/stubs/fpmRuntime.php
@@ -24,7 +24,7 @@
 
 fwrite(STDERR, 'Preparing to add secrets to runtime'.PHP_EOL);
 
-$secrets = Secrets::addToEnvironment(
+Secrets::addToEnvironment(
     $_ENV['VAPOR_SSM_PATH'],
     json_decode($_ENV['VAPOR_SSM_VARIABLES'] ?? '[]', true),
     __DIR__.'/vaporSecrets.php'
@@ -76,7 +76,7 @@
 fwrite(STDERR, 'Preparing to boot FPM'.PHP_EOL);
 
 $fpm = Fpm::boot(
-    __DIR__.'/httpHandler.php', $secrets
+    __DIR__.'/httpHandler.php'
 );
 
 /*

diff --git a/stubs/octaneRuntime.php b/stubs/octaneRuntime.php
@@ -24,7 +24,7 @@
 
 fwrite(STDERR, 'Preparing to add secrets to runtime'.PHP_EOL);
 
-$secrets = Secrets::addToEnvironment(
+Secrets::addToEnvironment(
     $_ENV['VAPOR_SSM_PATH'],
     json_decode($_ENV['VAPOR_SSM_VARIABLES'] ?? '[]', true),
     __DIR__.'/vaporSecrets.php'