Merge branch '5.4' into 6.4

* 5.4:
  [HttpClient] Fix setting CURLMOPT_MAXCONNECTS
  throw a meaningful exception when parsing dotenv files with BOM
  [Cache] Fix RedisSentinel params types
  [FrameworkBundle] Fix service reset between tests
  [Uid][Serializer][Validator] Mention RFC 9562
  make sure temp files can be cleaned up on Windows

Author: xabbuh

.github/workflows/integration-tests.yml

@@ -122,12 +122,19 @@ jobs:
         image: dunglas/frankenphp:1.1.0
         ports:
           - 80:80
+          - 8681:81
+          - 8682:82
+          - 8683:83
+          - 8684:84
         volumes:
           - ${{ github.workspace }}:/symfony
         env:
-          SERVER_NAME: 'http://localhost'
+          SERVER_NAME: 'http://localhost http://localhost:81 http://localhost:82 http://localhost:83 http://localhost:84'
           CADDY_SERVER_EXTRA_DIRECTIVES: |
-            root * /symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/
+            route /http-client* {
+              root * /symfony/src/Symfony/Component/HttpClient/Tests/Fixtures/response-functional/
+              php_server
+            }
 
     steps:
       - name: Checkout

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -129,6 +129,11 @@ protected static function ensureKernelShutdown()
             static::$kernel->shutdown();
             static::$booted = false;
 
+            if ($container->has('services_resetter')) {
+                // Instantiate the service because Container::reset() only resets services that have been used
+                $container->get('services_resetter');
+            }
+
             if ($container instanceof ResetInterface) {
                 $container->reset();
             }

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/ResettableService.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer;
+
+class ResettableService
+{
+    private $count = 0;
+
+    public function myCustomName(): void
+    {
+        ++$this->count;
+    }
+
+    public function getCount(): int
+    {
+        return $this->count;
+    }
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml

@@ -23,3 +23,8 @@ services:
         decorates: decorated
         properties:
             inner: '@.inner'
+
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\ResettableService:
+        public: true
+        tags:
+            - kernel.reset: { method: 'myCustomName' }

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -21,7 +21,7 @@
         "ext-xml": "*",
         "symfony/cache": "^5.4|^6.0|^7.0",
         "symfony/config": "^6.1|^7.0",
-        "symfony/dependency-injection": "^6.4|^7.0",
+        "symfony/dependency-injection": "^6.4.12|^7.0",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1|^7.0",
         "symfony/event-dispatcher": "^5.4|^6.0|^7.0",

src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php

@@ -32,7 +32,7 @@ public static function setUpBeforeClass(): void
             self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.');
         }
 
-        self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'prefix' => 'prefix_']);
+        self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']&timeout=0&retry_interval=0&read_timeout=0', ['redis_sentinel' => $service, 'prefix' => 'prefix_']);
     }
 
     public function testInvalidDSNHasBothClusterAndSentinel()

src/Symfony/Component/Cache/Traits/RedisTrait.php

@@ -232,10 +232,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                             $options = [
                                 'host' => $host,
                                 'port' => $port,
-                                'connectTimeout' => $params['timeout'],
+                                'connectTimeout' => (float) $params['timeout'],
                                 'persistent' => $params['persistent_id'],
-                                'retryInterval' => $params['retry_interval'],
-                                'readTimeout' => $params['read_timeout'],
+                                'retryInterval' => (int) $params['retry_interval'],
+                                'readTimeout' => (float) $params['read_timeout'],
                             ];
 
                             if ($passAuth) {

src/Symfony/Component/DependencyInjection/Container.php

@@ -288,7 +288,6 @@ public function initialized(string $id): bool
     public function reset()
     {
         $services = $this->services + $this->privates;
-        $this->services = $this->factories = $this->privates = [];
 
         foreach ($services as $service) {
             try {
@@ -299,6 +298,8 @@ public function reset()
                 continue;
             }
         }
+
+        $this->services = $this->factories = $this->privates = [];
     }
 
     /**

src/Symfony/Component/Dotenv/Dotenv.php

@@ -553,7 +553,13 @@ private function doLoad(bool $overrideExistingVars, array $paths): void
                 throw new PathException($path);
             }
 
-            $this->populate($this->parse(file_get_contents($path), $path), $overrideExistingVars);
+            $data = file_get_contents($path);
+
+            if ("\xEF\xBB\xBF" === substr($data, 0, 3)) {
+                throw new FormatException('Loading files starting with a byte-order-mark (BOM) is not supported.', new FormatExceptionContext($data, $path, 1, 0));
+            }
+
+            $this->populate($this->parse($data, $path), $overrideExistingVars);
         }
     }
 }

src/Symfony/Component/Dotenv/Tests/DotenvTest.php

@@ -604,4 +604,14 @@ public function testBootEnv()
         $resetContext();
         rmdir($tmpdir);
     }
+
+    public function testExceptionWithBom()
+    {
+        $dotenv = new Dotenv();
+
+        $this->expectException(FormatException::class);
+        $this->expectExceptionMessage('Loading files starting with a byte-order-mark (BOM) is not supported.');
+
+        $dotenv->load(__DIR__.'/fixtures/file_with_bom');
+    }
 }