Merge branch '5.4' into 6.0

* 5.4:
  Avoid duplicated session listener registration in tests
  [HttpFoundation] fix SessionHandlerFactory using connections
  [gha] swap the php versions we use in jobs
  [DoctrineBridge] fix calling get_class on non-object
  Update PR template
  ResponseListener needs only 2 parameters
  [Lock] create lock table if it does not exist
  [HttpClient] Fix handling error info in MockResponse
  [SecurityBundle] Fix invalid reference with `always_authenticate_before_granting`
  Bump Symfony version to 5.4.1
  Update VERSION for 5.4.0
  Update CHANGELOG for 5.4.0

Author: nicolas-grekas

Session/Storage/Handler/SessionHandlerFactory.php

@@ -23,10 +23,8 @@ class SessionHandlerFactory
 {
     public static function createHandler(object|string $connection): AbstractSessionHandler
     {
-        if (\is_string($connection) && $options = parse_url($connection)) {
+        if ($options = \is_string($connection) ? parse_url($connection) : false) {
             parse_str($options['query'] ?? '', $options);
-        } else {
-            $options = [];
         }
 
         switch (true) {
@@ -60,7 +58,7 @@ public static function createHandler(object|string $connection): AbstractSession
                 $handlerClass = str_starts_with($connection, 'memcached:') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
-                return new $handlerClass($connection, array_intersect_key($options, ['prefix' => 1, 'ttl' => 1]));
+                return new $handlerClass($connection, array_intersect_key($options ?: [], ['prefix' => 1, 'ttl' => 1]));
 
             case str_starts_with($connection, 'pdo_oci://'):
                 if (!class_exists(DriverManager::class)) {

Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\SessionHandlerFactory;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
 
@@ -28,7 +29,7 @@ class SessionHandlerFactoryTest extends TestCase
     /**
      * @dataProvider provideConnectionDSN
      */
-    public function testCreateHandler(string $connectionDSN, string $expectedPath, string $expectedHandlerType)
+    public function testCreateFileHandler(string $connectionDSN, string $expectedPath, string $expectedHandlerType)
     {
         $handler = SessionHandlerFactory::createHandler($connectionDSN);
 
@@ -45,4 +46,32 @@ public function provideConnectionDSN(): array
             'native file handler using provided save_path' => ['connectionDSN' => 'file://'.$base.'/session/storage', 'expectedPath' => $base.'/session/storage', 'expectedHandlerType' => StrictSessionHandler::class],
         ];
     }
+
+    /**
+     * @requires extension redis
+     */
+    public function testCreateRedisHandlerFromConnectionObject()
+    {
+        $handler = SessionHandlerFactory::createHandler($this->createMock(\Redis::class));
+        $this->assertInstanceOf(RedisSessionHandler::class, $handler);
+    }
+
+    /**
+     * @requires extension redis
+     */
+    public function testCreateRedisHandlerFromDsn()
+    {
+        $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar');
+        $this->assertInstanceOf(RedisSessionHandler::class, $handler);
+
+        $reflection = new \ReflectionObject($handler);
+
+        $prefixProperty = $reflection->getProperty('prefix');
+        $prefixProperty->setAccessible(true);
+        $this->assertSame('foo', $prefixProperty->getValue($handler));
+
+        $ttlProperty = $reflection->getProperty('ttl');
+        $ttlProperty->setAccessible(true);
+        $this->assertSame('3600', $ttlProperty->getValue($handler));
+    }
 }