Predis: Fix specifying password via options instead of DSN

snc · Dec 31, 2022 · 4c81b59 · 4c81b59
1 parent 1dd46f1
commit 4c81b59
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Factory/PredisParametersFactory.php b/src/Factory/PredisParametersFactory.php
@@ -8,6 +8,7 @@
 use Predis\Connection\ParametersInterface;
 use Snc\RedisBundle\DependencyInjection\Configuration\RedisDsn;
 
+use function array_filter;
 use function array_merge;
 use function is_a;
 use function sprintf;
@@ -62,6 +63,6 @@ private static function parseDsn(RedisDsn $dsn): array
             $options['alias'] = $dsn->getAlias();
         }
 
-        return $options;
+        return array_filter($options, static fn ($value) => $value !== null);
     }
 }
diff --git a/tests/Factory/PredisParametersFactoryTest.php b/tests/Factory/PredisParametersFactoryTest.php
@@ -83,7 +83,7 @@ public function createDp(): array
             ],
             [
                 'redis://localhost?alias=master',
-                'Predis\Connection\Parameters',
+                Parameters::class,
                 ['replication' => true],
                 [
                     'scheme' => 'tcp',
@@ -98,7 +98,7 @@ public function createDp(): array
             ],
             [
                 'redis://localhost?alias=connection_alias',
-                'Predis\Connection\Parameters',
+                Parameters::class,
                 [
                     'replication' => true,
                     'alias' => 'client_alias',
@@ -116,13 +116,23 @@ public function createDp(): array
             ],
             [
                 'redis://localhost/0',
-                'Predis\Connection\Parameters',
+                Parameters::class,
                 ['persistent' => true],
                 [
                     'persistent' => true,
                     'database' => 0,
                 ],
             ],
+
+            [
+                'redis://localhost',
+                Parameters::class,
+                ['database' => 11, 'password' => 'pass'],
+                [
+                    'database' => 11,
+                    'password' => 'pass',
+                ],
+            ],
         ];
     }