bug #62096 [Cache] fix compatibility with Relay 0.12.1 (xabbuh)

nicolas-grekas · nicolas-grekas · commit 0062f113be24 · 2025-10-17T14:52:56.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Cache] fix compatibility with Relay 0.12.1 | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT I missed to target the `6.4` branch for the changes done in #62087 that don't target the cluster implementation. Commits ------- 4e526c0 fix compatibility with Relay 0.12.1
diff --git a/src/Symfony/Component/Cache/Traits/Relay/Relay121Trait.php b/src/Symfony/Component/Cache/Traits/Relay/Relay121Trait.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits\Relay;
+
+if (version_compare(phpversion('relay'), '0.12.1', '>=')) {
+    /**
+     * @internal
+     */
+    trait Relay121Trait
+    {
+        public function hgetWithMeta($hash, $member): \Relay\Relay|array|false
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetWithMeta(...\func_get_args());
+        }
+
+        public function select($db): \Relay\Relay|bool|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
+        }
+
+        public function watch($key, ...$other_keys): \Relay\Relay|bool|string
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Relay121Trait
+    {
+        public function select($db): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
+        }
+
+        public function watch($key, ...$other_keys): \Relay\Relay|bool
+        {
+            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
+        }
+    }
+}
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Cache\Traits\Relay\NullableReturnTrait;
 use Symfony\Component\Cache\Traits\Relay\PfcountTrait;
 use Symfony\Component\Cache\Traits\Relay\Relay11Trait;
+use Symfony\Component\Cache\Traits\Relay\Relay121Trait;
 use Symfony\Component\Cache\Traits\Relay\Relay12Trait;
 use Symfony\Component\Cache\Traits\Relay\SwapdbTrait;
 use Symfony\Component\VarExporter\LazyObjectInterface;
@@ -56,6 +57,7 @@ class RelayProxy extends \Relay\Relay implements ResetInterface, LazyObjectInter
     use RelayProxyTrait;
     use Relay11Trait;
     use Relay12Trait;
+    use Relay121Trait;
     use SwapdbTrait;
 
     private const LAZY_OBJECT_PROPERTY_SCOPES = [];
@@ -250,11 +252,6 @@ public function rawCommand($cmd, ...$args): mixed
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rawCommand(...\func_get_args());
     }
 
-    public function select($db): \Relay\Relay|bool
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select(...\func_get_args());
-    }
-
     public function auth(#[\SensitiveParameter] $auth): bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->auth(...\func_get_args());
@@ -940,11 +937,6 @@ public function wait($replicas, $timeout): \Relay\Relay|false|int
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->wait(...\func_get_args());
     }
 
-    public function watch($key, ...$other_keys): \Relay\Relay|bool
-    {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch(...\func_get_args());
-    }
-
     public function unwatch(): \Relay\Relay|bool
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->unwatch(...\func_get_args());
