symfony
diff --git a/‎.github/workflows/integration-tests.yml
Copy file name to clipboardExpand all lines: .github/workflows/integration-tests.yml
+7Lines changed: 7 additions & 0 deletions b/‎.github/workflows/integration-tests.yml
Copy file name to clipboardExpand all lines: .github/workflows/integration-tests.yml
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Cache/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
+16-7Lines changed: 16 additions & 7 deletions b/‎src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
+16-7Lines changed: 16 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Cache/Traits/RedisTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RedisTrait.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Cache/Traits/RedisTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RedisTrait.php
+4-4Lines changed: 4 additions & 4 deletions
@@ -48,6 +48,12 @@ jobs:
         image: redis:6.2.8
         ports:
           - 16379:6379
+      redis-authenticated:
+        image: redis:6.2.8
+        ports:
+          - 16380:6379
+        env:
+          REDIS_ARGS: "--requirepass p@ssword"
       redis-cluster:
         image: grokzen/redis-cluster:6.2.8
         ports:
@@ -170,6 +176,7 @@ jobs:
         run: ./phpunit --group integration -v
         env:
           REDIS_HOST: 'localhost:16379'
+          REDIS_AUTHENTICATED_HOST: 'localhost:16380'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'unreachable-host:26379 localhost:26379 localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
 
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Add url decoding of password in `RedisTrait` DSN
+
 7.0
 ---
 
 
@@ -14,15 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Traits\RedisTrait;
 
+/**
+ * @requires extension redis
+ */
 class RedisTraitTest extends TestCase
 {
-    public static function setUpBeforeClass(): void
-    {
-        if (!getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-    }
-
     /**
      * @dataProvider provideCreateConnection
      */
@@ -41,6 +37,19 @@ public function testCreateConnection(string $dsn, string $expectedClass)
         self::assertInstanceOf($expectedClass, $connection);
     }
 
+    public function testUrlDecodeParameters()
+    {
+        if (!getenv('REDIS_AUTHENTICATED_HOST')) {
+            self::markTestSkipped('REDIS_AUTHENTICATED_HOST env var is not defined.');
+        }
+
+        $mock = self::getObjectForTrait(RedisTrait::class);
+        $connection = $mock::createConnection('redis://:p%40ssword@'.getenv('REDIS_AUTHENTICATED_HOST'));
+
+        self::assertInstanceOf(\Redis::class, $connection);
+        self::assertSame('p@ssword', $connection->getAuth());
+    }
+
     public static function provideCreateConnection(): array
     {
         $hosts = array_map(fn ($host) => sprintf('host[%s]', $host), explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
 
@@ -101,9 +101,9 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m['password'])) {
                 if (\in_array($m['user'], ['', 'default'], true)) {
-                    $auth = $m['password'];
+                    $auth = urldecode($m['password']);
                 } else {
-                    $auth = [$m['user'], $m['password']];
+                    $auth = [$m['user'], urldecode($m['password'])];
                 }
 
                 if ('' === $auth) {
@@ -369,9 +369,9 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 if (\is_array($auth)) {
                     // ACL
                     $params['parameters']['username'] = $auth[0];
-                    $params['parameters']['password'] = $auth[1];
+                    $params['parameters']['password'] = urldecode($auth[1]);
                 } else {
-                    $params['parameters']['password'] = $auth;
+                    $params['parameters']['password'] = urldecode($auth);
                 }
             }