Merge branch '6.4' into 7.4

nicolas-grekas · nicolas-grekas · commit dab514cf52d8 · 2026-04-14T14:21:03.000+02:00
* 6.4:
  [VarExporter] Don't warn for __sleep()-listed uninitialized typed properties
  [Dotenv] Fix variable corruption when loading env more than once
diff --git a/Dotenv.php b/Dotenv.php
@@ -37,6 +37,7 @@ final class Dotenv
     private int $end;
     private array $values = [];
     private array $overriddenValues = [];
+    private array $loadedRawVars = [];
     private array $prodEnvs = ['prod'];
     private bool $usePutenv = false;
 
@@ -646,10 +647,16 @@ private function doLoad(bool $overrideExistingVars, array $paths): void
 
             $values = $this->parseRaw($data, $path);
 
+            $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? ''));
+            unset($loadedVars['']);
+
             foreach ($values as $name => $_) {
                 if (!isset($this->overriddenValues[$name]) && isset($_ENV[$name])) {
                     $this->overriddenValues[$name] = $_ENV[$name];
                 }
+                if (isset($loadedVars[$name]) || $overrideExistingVars || !isset($_ENV[$name])) {
+                    $this->loadedRawVars[$name] = true;
+                }
             }
 
             $this->populate($values, $overrideExistingVars);
@@ -705,6 +712,10 @@ private function resolveLoadedVars(): void
         $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? ''));
         unset($loadedVars['']);
 
+        $rawVars = $this->loadedRawVars;
+        $this->loadedRawVars = [];
+        unset($rawVars['SYMFONY_DOTENV_VARS']);
+
         $this->values = [];
         $this->path = '';
         $this->data = '';
@@ -716,10 +727,7 @@ private function resolveLoadedVars(): void
         // (e.g. MY_VAR="${MY_VAR:-default}") so their own raw value is hidden
         // during resolution, allowing the default to trigger correctly.
         $selfReferencingVars = [];
-        foreach ($loadedVars as $name => $_) {
-            if ('SYMFONY_DOTENV_VARS' === $name) {
-                continue;
-            }
+        foreach ($rawVars as $name => $_) {
             $value = $_ENV[$name] ?? '';
             if (str_contains($value, '$') && preg_match('/\$\{?'.preg_quote($name, '/').'(?![A-Za-z0-9_])/', $value)) {
                 $selfReferencingVars[$name] = true;
@@ -728,10 +736,7 @@ private function resolveLoadedVars(): void
 
         for ($pass = 0; $pass < 5; ++$pass) {
             $resolved = [];
-            foreach ($loadedVars as $name => $_) {
-                if ('SYMFONY_DOTENV_VARS' === $name) {
-                    continue;
-                }
+            foreach ($rawVars as $name => $_) {
                 if (!str_contains($value = $_ENV[$name] ?? '', '$')) {
                     continue;
                 }
@@ -785,10 +790,7 @@ private function resolveLoadedVars(): void
 
         // Restore literal $ signs and unescape backslashes
         $restored = [];
-        foreach ($loadedVars as $name => $_) {
-            if ('SYMFONY_DOTENV_VARS' === $name) {
-                continue;
-            }
+        foreach ($rawVars as $name => $_) {
             $value = $_ENV[$name] ?? '';
             if ($value !== $newValue = str_replace(["\x00", '\\\\'], ['$', '\\'], $value)) {
                 $restored[$name] = $newValue;
diff --git a/Tests/DotenvTest.php b/Tests/DotenvTest.php
@@ -235,6 +235,41 @@ public function testLoad()
         $this->assertSame('BAZ', $bar);
     }
 
+    public function testLoadDoesNotReResolveAlreadyLoadedVars()
+    {
+        unset($_ENV['FOO'], $_ENV['BAR'], $_ENV['SYMFONY_DOTENV_VARS']);
+        unset($_SERVER['FOO'], $_SERVER['BAR'], $_SERVER['SYMFONY_DOTENV_VARS']);
+        putenv('FOO');
+        putenv('BAR');
+        putenv('SYMFONY_DOTENV_VARS');
+
+        @mkdir($tmpdir = sys_get_temp_dir().'/dotenv');
+
+        $path1 = tempnam($tmpdir, 'sf-');
+        $path2 = tempnam($tmpdir, 'sf-');
+
+        file_put_contents($path1, "FOO='This\$isokay'");
+        file_put_contents($path2, "BAR='hello'");
+
+        try {
+            (new Dotenv())->load($path1);
+            $this->assertSame('This$isokay', $_ENV['FOO']);
+
+            (new Dotenv())->load($path2);
+            $this->assertSame('This$isokay', $_ENV['FOO']);
+            $this->assertSame('hello', $_ENV['BAR']);
+        } finally {
+            unset($_ENV['FOO'], $_ENV['BAR'], $_ENV['SYMFONY_DOTENV_VARS']);
+            unset($_SERVER['FOO'], $_SERVER['BAR'], $_SERVER['SYMFONY_DOTENV_VARS']);
+            putenv('FOO');
+            putenv('BAR');
+            putenv('SYMFONY_DOTENV_VARS');
+            unlink($path1);
+            unlink($path2);
+            rmdir($tmpdir);
+        }
+    }
+
     public function testLoadEnv()
     {
         $resetContext = static function (): void {
