Merge branch '5.4' into 6.0

* 5.4: (33 commits)
  do not pass a boolean to the constructor of the Dotenv class
  [Notifier] Fix low-deps tests
  Deprecate Composer 1
  [Filesystem] Add third argument `$lockFile` to `Filesystem::appendToFile()`
  [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions
  [PhpUnitBridge] fix symlink to bridge in docker by making its path relative
  [Dotenv] Duplicate $_SERVER values in $_ENV if they don't exist
  Fix markup
  [Notifier] Add Expo bridge
  Add polish translations (#43725)
  Rename translation:update to translation:extract
  [String] Add PLURAL_MAP "zombies" -- fix #43789
  Added support for `statusCode` default parameter when loading a template directly from route using the `Symfony\Bundle\FrameworkBundle\Controller\TemplateController` controller.
  [Validator] Update validators.bs.xlf
  Cache voters that will always abstain
  [Messenger] Fix `TraceableMessageBus` implementation so it can compute caller even when used within a callback
  [Validator] Add the missing translations for Russian (ru)
  [Validator] Added missing translations for Latvian (lv)
  [Validator] Added missing translations
  [Validator] Add missing translations for Vietnamese (VI)
  ...

Author: xabbuh

Dotenv.php

@@ -182,8 +182,12 @@ public function populate(array $values, bool $overrideExistingVars = false): voi
 
         foreach ($values as $name => $value) {
             $notHttpName = 0 !== strpos($name, 'HTTP_');
+            if (isset($_SERVER[$name]) && $notHttpName && !isset($_ENV[$name])) {
+                $_ENV[$name] = $_SERVER[$name];
+            }
+
             // don't check existence with getenv() because of thread safety issues
-            if (!isset($loadedVars[$name]) && (!$overrideExistingVars && (isset($_ENV[$name]) || (isset($_SERVER[$name]) && $notHttpName)))) {
+            if (!isset($loadedVars[$name]) && !$overrideExistingVars && isset($_ENV[$name])) {
                 continue;
             }
 

Tests/DotenvTest.php

@@ -539,6 +539,16 @@ public function testDoNotUsePutenv()
         $this->assertFalse(getenv('TEST_USE_PUTENV'));
     }
 
+    public function testSERVERVarsDuplicationInENV()
+    {
+        unset($_ENV['SYMFONY_DOTENV_VARS'], $_SERVER['SYMFONY_DOTENV_VARS'], $_ENV['FOO']);
+        $_SERVER['FOO'] = 'CCC';
+
+        (new Dotenv())->populate(['FOO' => 'BAR']);
+
+        $this->assertSame('CCC', $_ENV['FOO']);
+    }
+
     public function testBootEnv()
     {
         $resetContext = static function (): void {