[VarDumper] Add Relay support

Author: ostrolucky

CHANGELOG.md

@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add caster for `WeakMap`
  * Add support of named arguments to `dd()` and `dump()` to display the argument name
+ * Add support for `Relay\Relay`
 
 6.2
 ---

Caster/RedisCaster.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\VarDumper\Caster;
 
+use Relay\Relay;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
@@ -23,15 +24,15 @@
 class RedisCaster
 {
     private const SERIALIZERS = [
-        \Redis::SERIALIZER_NONE => 'NONE',
-        \Redis::SERIALIZER_PHP => 'PHP',
+        0 => 'NONE', // Redis::SERIALIZER_NONE
+        1 => 'PHP', // Redis::SERIALIZER_PHP
         2 => 'IGBINARY', // Optional Redis::SERIALIZER_IGBINARY
     ];
 
     private const MODES = [
-        \Redis::ATOMIC => 'ATOMIC',
-        \Redis::MULTI => 'MULTI',
-        \Redis::PIPELINE => 'PIPELINE',
+        0 => 'ATOMIC', // Redis::ATOMIC
+        1 => 'MULTI', // Redis::MULTI
+        2 => 'PIPELINE', // Redis::PIPELINE
     ];
 
     private const COMPRESSION_MODES = [
@@ -46,7 +47,7 @@ class RedisCaster
         \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES => 'DISTRIBUTE_SLAVES',
     ];
 
-    public static function castRedis(\Redis $c, array $a, Stub $stub, bool $isNested)
+    public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -102,9 +103,9 @@ public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub,
         return $a;
     }
 
-    private static function getRedisOptions(\Redis|\RedisArray|\RedisCluster $redis, array $options = []): EnumStub
+    private static function getRedisOptions(\Redis|Relay|\RedisArray|\RedisCluster $redis, array $options = []): EnumStub
     {
-        $serializer = $redis->getOption(\Redis::OPT_SERIALIZER);
+        $serializer = $redis->getOption(\defined('Redis::OPT_SERIALIZER') ? \Redis::OPT_SERIALIZER : 1);
         if (\is_array($serializer)) {
             foreach ($serializer as &$v) {
                 if (isset(self::SERIALIZERS[$v])) {
@@ -136,11 +137,11 @@ private static function getRedisOptions(\Redis|\RedisArray|\RedisCluster $redis,
         }
 
         $options += [
-            'TCP_KEEPALIVE' => \defined('Redis::OPT_TCP_KEEPALIVE') ? $redis->getOption(\Redis::OPT_TCP_KEEPALIVE) : 0,
-            'READ_TIMEOUT' => $redis->getOption(\Redis::OPT_READ_TIMEOUT),
+            'TCP_KEEPALIVE' => \defined('Redis::OPT_TCP_KEEPALIVE') ? $redis->getOption(\Redis::OPT_TCP_KEEPALIVE) : Relay::OPT_TCP_KEEPALIVE,
+            'READ_TIMEOUT' => $redis->getOption(\defined('Redis::OPT_READ_TIMEOUT') ? \Redis::OPT_READ_TIMEOUT : Relay::OPT_READ_TIMEOUT),
             'COMPRESSION' => $compression,
             'SERIALIZER' => $serializer,
-            'PREFIX' => $redis->getOption(\Redis::OPT_PREFIX),
+            'PREFIX' => $redis->getOption(\defined('Redis::OPT_PREFIX') ? \Redis::OPT_PREFIX : Relay::OPT_PREFIX),
             'SCAN' => $retry,
         ];
 

Cloner/AbstractCloner.php

@@ -130,6 +130,7 @@ abstract class AbstractCloner implements ClonerInterface
         'WeakReference' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castWeakReference'],
 
         'Redis' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'],
+        'Relay\Relay' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'],
         'RedisArray' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisArray'],
         'RedisCluster' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisCluster'],
 

Tests/Caster/RedisCasterTest.php

@@ -16,13 +16,15 @@
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
- * @requires extension redis
  * @group integration
  */
 class RedisCasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
+    /**
+     * @requires extension redis
+     */
     public function testNotConnected()
     {
         $redis = new \Redis();
@@ -36,18 +38,26 @@ public function testNotConnected()
         $this->assertDumpMatchesFormat($xCast, $redis);
     }
 
-    public function testConnected()
+    /**
+     * @testWith ["Redis"]
+     *           ["Relay\\Relay"]
+     */
+    public function testConnected(string $class)
     {
+        if (!class_exists($class)) {
+            self::markTestSkipped(sprintf('"%s" class required', $class));
+        }
+
         $redisHost = explode(':', getenv('REDIS_HOST')) + [1 => 6379];
-        $redis = new \Redis();
+        $redis = new $class;
         try {
             $redis->connect(...$redisHost);
         } catch (\Exception $e) {
             self::markTestSkipped($e->getMessage());
         }
 
         $xCast = <<<EODUMP
-Redis {%A
+%a {%A
   isConnected: true
   host: "{$redisHost[0]}"
   port: {$redisHost[1]}
@@ -56,9 +66,9 @@ public function testConnected()
   dbNum: 0
   timeout: 0.0
   lastError: null
-  persistentId: null
+  persistentId: %a
   options: {
-    TCP_KEEPALIVE: 0
+    TCP_KEEPALIVE: %a
     READ_TIMEOUT: 0.0
     COMPRESSION: NONE
     SERIALIZER: NONE