Merge branch '7.2' into 7.3

* 7.2:
  [psalm] ensureOverrideAttribute="false"
  [Semaphore] allow redis cluster/sentinel dsn
  [MIME] use address for body at PathHeader

Author: nicolas-grekas

psalm.xml

@@ -10,6 +10,7 @@
     findUnusedBaselineEntry="false"
     findUnusedCode="false"
     findUnusedIssueHandlerSuppression="false"
+    ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src" />

src/Symfony/Component/Mime/Header/PathHeader.php

@@ -57,6 +57,6 @@ public function getAddress(): Address
 
     public function getBodyAsString(): string
     {
-        return '<'.$this->address->toString().'>';
+        return '<'.$this->address->getEncodedAddress().'>';
     }
 }

src/Symfony/Component/Mime/Tests/Header/HeadersTest.php

@@ -346,4 +346,12 @@ public function testSetHeaderParameterNotParameterized()
         $this->expectException(\LogicException::class);
         $headers->setHeaderParameter('Content-Disposition', 'name', 'foo');
     }
+
+    public function testPathHeaderHasNoName()
+    {
+        $headers = new Headers();
+
+        $headers->addPathHeader('Return-Path', new Address('some@path', 'any ignored name'));
+        $this->assertSame('<some@path>', $headers->get('Return-Path')->getBodyAsString());
+    }
 }

src/Symfony/Component/Semaphore/Store/StoreFactory.php

@@ -35,8 +35,8 @@ public static function createStore(#[\SensitiveParameter] object|string $connect
 
             case !\is_string($connection):
                 throw new InvalidArgumentException(\sprintf('Unsupported Connection: "%s".', $connection::class));
-            case str_starts_with($connection, 'redis://'):
-            case str_starts_with($connection, 'rediss://'):
+            case str_starts_with($connection, 'redis:'):
+            case str_starts_with($connection, 'rediss:'):
                 if (!class_exists(AbstractAdapter::class)) {
                     throw new InvalidArgumentException('Unsupported Redis DSN. Try running "composer require symfony/cache".');
                 }

src/Symfony/Component/Semaphore/Tests/Store/StoreFactoryTest.php

@@ -12,54 +12,37 @@
 namespace Symfony\Component\Semaphore\Tests\Store;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Semaphore\Store\RedisStore;
 use Symfony\Component\Semaphore\Store\StoreFactory;
 
 /**
  * @author Jérémy Derussé <[email protected]>
- *
- * @requires extension redis
  */
 class StoreFactoryTest extends TestCase
 {
-    public function testCreateRedisStore()
+    /**
+     * @dataProvider validConnections
+     */
+    public function testCreateStore($connection, string $expectedStoreClass)
     {
-        $store = StoreFactory::createStore($this->createMock(\Redis::class));
+        $store = StoreFactory::createStore($connection);
 
-        $this->assertInstanceOf(RedisStore::class, $store);
+        $this->assertInstanceOf($expectedStoreClass, $store);
     }
 
-    public function testCreateRedisProxyStore()
+    public static function validConnections(): \Generator
     {
-        if (!class_exists(RedisProxy::class)) {
-            $this->markTestSkipped();
-        }
+        yield [new \Predis\Client(), RedisStore::class];
 
-        $store = StoreFactory::createStore($this->createMock(RedisProxy::class));
-
-        $this->assertInstanceOf(RedisStore::class, $store);
-    }
-
-    public function testCreateRedisAsDsnStore()
-    {
-        if (!class_exists(RedisProxy::class)) {
-            $this->markTestSkipped();
+        if (class_exists(\Redis::class)) {
+            yield [new \Redis(), RedisStore::class];
         }
-
-        $store = StoreFactory::createStore('redis://localhost');
-
-        $this->assertInstanceOf(RedisStore::class, $store);
-    }
-
-    public function testCreatePredisStore()
-    {
-        if (!class_exists(\Predis\Client::class)) {
-            $this->markTestSkipped();
+        if (class_exists(\Redis::class) && class_exists(AbstractAdapter::class)) {
+            yield ['redis://localhost', RedisStore::class];
+            yield ['redis://localhost?lazy=1', RedisStore::class];
+            yield ['redis://localhost?redis_cluster=1', RedisStore::class];
+            yield ['redis://localhost?redis_cluster=1&lazy=1', RedisStore::class];
+            yield ['redis:?host[localhost]&host[localhost:6379]&redis_cluster=1', RedisStore::class];
         }
-
-        $store = StoreFactory::createStore(new \Predis\Client());
-
-        $this->assertInstanceOf(RedisStore::class, $store);
     }
 }