[Cache] Add support for \Relay\Cluster $context in the connection string

dorrogeray · dorrogeray · commit b8bd231f941b · 2025-02-26T18:15:57.000+01:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -48,6 +48,7 @@ trait RedisTrait
         'lazy' => null,
         'redis_cluster' => false,
         'relay_cluster' => false,
+        'relay_cluster_context' => [],
         'redis_sentinel' => null,
         'dbindex' => 0,
         'failover' => 'none',
@@ -377,14 +378,34 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 }
 
                 try {
+                    $relayClusterContext = $params['relay_cluster_context'];
+
+                    foreach (['allow_self_signed', 'verify_peer_name','verify_peer'] as $contextStreamBoolField) {
+                        if(isset($relayClusterContext['stream'][$contextStreamBoolField])) {
+                            $relayClusterContext['stream'][$contextStreamBoolField] = filter_var($relayClusterContext['stream'][$contextStreamBoolField], \FILTER_VALIDATE_BOOL);
+                        }
+                    }
+
+                    foreach (['use-cache', 'client-tracking','throw-on-error','client-invalidations','reply-literal','persistent'] as $contextBoolField) {
+                        if(isset($relayClusterContext[$contextBoolField])) {
+                            $relayClusterContext[$contextBoolField] = filter_var($relayClusterContext[$contextBoolField], \FILTER_VALIDATE_BOOL);
+                        }
+                    }
+
+                    foreach (['max-retries', 'serializer','compression','compression-level'] as $contextIntField) {
+                        if(isset($relayClusterContext[$contextIntField])) {
+                            $relayClusterContext[$contextIntField] = filter_var($relayClusterContext[$contextIntField], \FILTER_VALIDATE_INT);
+                        }
+                    }
+
                     $relayCluster = new $class(
                         name: null,
                         seeds: $hosts,
                         connect_timeout: $params['timeout'],
                         command_timeout: $params['command_timeout'],
                         persistent: (bool) $params['persistent'],
                         auth: $params['auth'] ?? null,
-                        context: []
+                        context: $relayClusterContext
                     );
                 } catch (\Relay\Exception $e) {
                     throw new InvalidArgumentException('Relay cluster connection failed: '.$e->getMessage());
@@ -541,11 +562,6 @@ protected function doClear(string $namespace): bool
                 $address = implode(':', $ipAndPort);
                 $cursor = null;
                 do {
-                    // mixed &$iterator
-                    // array|string $key_or_address
-                    // mixed $match = null
-                    // int $count = 0
-                    // string|null $type = null
                     $keys = $this->redis->scan($cursor, $address, $pattern, 1000);
                     if (isset($keys[1]) && \is_array($keys[1])) {
                         $cursor = $keys[0];
