[Cache] make Redis*Proxy extend Redis*

Author: nicolas-grekas

Session/Storage/Handler/RedisSessionHandler.php

@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 use Predis\Response\ErrorInterface;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
 
 /**
  * Redis based session storage handler based on the Redis class
@@ -23,8 +21,6 @@
  */
 class RedisSessionHandler extends AbstractSessionHandler
 {
-    private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis;
-
     /**
      * Key prefix for shared environments.
      */
@@ -42,13 +38,14 @@ class RedisSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When unsupported client or options are passed
      */
-    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis, array $options = [])
-    {
+    public function __construct(
+        private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        array $options = [],
+    ) {
         if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) {
             throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
         }
 
-        $this->redis = $redis;
         $this->prefix = $options['prefix'] ?? 'sf_s';
         $this->ttl = $options['ttl'] ?? null;
     }

Session/Storage/Handler/SessionHandlerFactory.php

@@ -13,8 +13,6 @@
 
 use Doctrine\DBAL\DriverManager;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
 
 /**
  * @author Nicolas Grekas <[email protected]>
@@ -37,8 +35,6 @@ public static function createHandler(object|string $connection, array $options =
             case $connection instanceof \RedisArray:
             case $connection instanceof \RedisCluster:
             case $connection instanceof \Predis\ClientInterface:
-            case $connection instanceof RedisProxy:
-            case $connection instanceof RedisClusterProxy:
                 return new RedisSessionHandler($connection);
 
             case $connection instanceof \Memcached:

composer.json

@@ -29,6 +29,9 @@
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/rate-limiter": "^5.2|^6.0"
     },
+    "conflict": {
+        "symfony/cache": "<6.2"
+    },
     "suggest" : {
         "symfony/mime": "To use the file extension guesser"
     },