minor symfony#51136 [Cache] Fix generating proxies when ext-redis v6 is installed (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5dfc9f349a9d · 2023-07-27T18:16:23.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Cache] Fix generating proxies when ext-redis v6 is installed | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 4da5a79 [Cache] Fix generating proxies when ext-redis v6 is installed
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -15,12 +15,11 @@
 use Symfony\Component\VarExporter\LazyProxyTrait;
 use Symfony\Component\VarExporter\ProxyHelper;
 
-/**
- * @requires extension redis
- */
 class RedisProxiesTest extends TestCase
 {
     /**
+     * @requires extension redis < 6
+     *
      * @testWith ["Redis"]
      *           ["RedisCluster"]
      */
@@ -50,24 +49,31 @@ public function testRedis5Proxy($class)
     }
 
     /**
+     * @requires extension redis
+     *
      * @testWith ["Redis", "redis"]
      *           ["RedisCluster", "redis_cluster"]
      */
     public function testRedis6Proxy($class, $stub)
     {
-        $this->markTestIncomplete('To be re-enabled when phpredis v6 becomes stable');
+        if (version_compare(phpversion('redis'), '6.0.0', '<')) {
+            $this->markTestIncomplete('To be re-enabled when phpredis v6 becomes stable');
 
-        $stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");
-        $stub = preg_replace('/^class /m', 'return; \0', $stub);
-        $stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);
-        $stub = preg_replace('/^    public const .*/m', '', $stub);
-        eval(substr($stub, 5));
+            $stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");
+            $stub = preg_replace('/^class /m', 'return; \0', $stub);
+            $stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);
+            $stub = preg_replace('/^    public const .*/m', '', $stub);
+            eval(substr($stub, 5));
+            $r = new \ReflectionClass($class.'StubInterface');
+        } else {
+            $r = new \ReflectionClass($class);
+        }
 
         $proxy = file_get_contents(\dirname(__DIR__, 2)."/Traits/{$class}6Proxy.php");
         $proxy = substr($proxy, 0, 4 + strpos($proxy, '[];'));
         $methods = [];
 
-        foreach ((new \ReflectionClass($class.'StubInterface'))->getMethods() as $method) {
+        foreach ($r->getMethods() as $method) {
             if ('reset' === $method->name || method_exists(LazyProxyTrait::class, $method->name)) {
                 continue;
             }
