[Cache] Add type to redis scan call to avoid using default "" which returns empty array

mfadul24 · mfadul24 · commit d9f93e3ad81d · 2023-10-09T22:41:05.000+02:00
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
@@ -17,13 +17,6 @@
 
 class RedisTraitTest extends TestCase
 {
-    public static function setUpBeforeClass(): void
-    {
-        if (!getenv('REDIS_CLUSTER_HOSTS')) {
-            throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-    }
-
     /**
      * @dataProvider provideCreateConnection
      */
@@ -65,4 +58,31 @@ public static function provideCreateConnection(): array
             ],
         ];
     }
+
+    public function testClearUsesValidType()
+    {
+        if (!class_exists(\Redis::class)) {
+            throw new SkippedTestSuiteError(sprintf('The "%s" class is required.', \Redis::class));
+        }
+        $redisMock = $this->getMockBuilder(\Redis::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $redisMock->method('info')->willReturn(['redis_version' => '3.0.0']);
+        $redisMock->expects(self::once())
+            ->method('scan')
+            ->with(null, 'some-namespace*', 1000, 'string')
+            ->willReturn([0, []]);
+        $mock = new class($redisMock) {
+            use RedisTrait {
+                doClear as public;
+            }
+
+            public function __construct($redis)
+            {
+                $this->redis = $redis;
+            }
+        };
+
+        $mock->doClear('some-namespace');
+    }
 }
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -291,8 +291,10 @@ public static function createConnection(string $dsn, array $options = [])
         } elseif (is_a($class, \RedisArray::class, true)) {
             foreach ($hosts as $i => $host) {
                 switch ($host['scheme']) {
-                    case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
-                    case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                    case 'tcp': $hosts[$i] = $host['host'].':'.$host['port'];
+                        break;
+                    case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port'];
+                        break;
                     default: $hosts[$i] = $host['path'];
                 }
             }
@@ -312,8 +314,10 @@ public static function createConnection(string $dsn, array $options = [])
             $initializer = static function () use ($class, $params, $dsn, $hosts) {
                 foreach ($hosts as $i => $host) {
                     switch ($host['scheme']) {
-                        case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
-                        case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                        case 'tcp': $hosts[$i] = $host['host'].':'.$host['port'];
+                            break;
+                        case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port'];
+                            break;
                         default: $hosts[$i] = $host['path'];
                     }
                 }
@@ -328,9 +332,12 @@ public static function createConnection(string $dsn, array $options = [])
                     $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
                 }
                 switch ($params['failover']) {
-                    case 'error': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_ERROR); break;
-                    case 'distribute': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE); break;
-                    case 'slaves': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES); break;
+                    case 'error': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_ERROR);
+                        break;
+                    case 'distribute': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE);
+                        break;
+                    case 'slaves': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES);
+                        break;
                 }
 
                 return $redis;
@@ -476,7 +483,7 @@ protected function doClear(string $namespace)
 
             $cursor = null;
             do {
-                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
+                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000, 'string');
                 if (isset($keys[1]) && \is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
