From a0a0867d2b6d4e09b9734fcd5f1757710076698b Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Wed, 17 Jul 2024 09:53:22 +0200
Subject: [PATCH] do not use LazyProxyTrait in RelayProxyTrait

---
 .../Cache/Tests/Traits/RedisProxiesTest.php   |  4 +-
 .../Cache/Traits/RelayProxyTrait.php          | 50 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
index bddd683917d29..293770d708d3c 100644
--- a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
+++ b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -72,10 +72,10 @@ public function testRelayProxy()
                 continue;
             }
 
-            $return = $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
+            $return = '__construct' === $method->name || $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
             $expectedMethods[$method->name] = "\n    ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP
                 {
-                    {$return}(\$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)())->{$method->name}({$args});
+                    {$return}\$this->initializeLazyObject()->{$method->name}({$args});
                 }
 
             EOPHP;
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxyTrait.php b/src/Symfony/Component/Cache/Traits/RelayProxyTrait.php
index a1d252b96d2bf..258370717c243 100644
--- a/src/Symfony/Component/Cache/Traits/RelayProxyTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RelayProxyTrait.php
@@ -24,122 +24,122 @@ public function copy($src, $dst, $options = null): \Relay\Relay|bool
 
         public function jsonArrAppend($key, $value_or_array, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrAppend(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrAppend(...\func_get_args());
         }
 
         public function jsonArrIndex($key, $path, $value, $start = 0, $stop = -1): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrIndex(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrIndex(...\func_get_args());
         }
 
         public function jsonArrInsert($key, $path, $index, $value, ...$other_values): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrInsert(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrInsert(...\func_get_args());
         }
 
         public function jsonArrLen($key, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrLen(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrLen(...\func_get_args());
         }
 
         public function jsonArrPop($key, $path = null, $index = -1): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrPop(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrPop(...\func_get_args());
         }
 
         public function jsonArrTrim($key, $path, $start, $stop): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonArrTrim(...\func_get_args());
+            return $this->initializeLazyObject()->jsonArrTrim(...\func_get_args());
         }
 
         public function jsonClear($key, $path = null): \Relay\Relay|false|int
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonClear(...\func_get_args());
+            return $this->initializeLazyObject()->jsonClear(...\func_get_args());
         }
 
         public function jsonDebug($command, $key, $path = null): \Relay\Relay|false|int
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonDebug(...\func_get_args());
+            return $this->initializeLazyObject()->jsonDebug(...\func_get_args());
         }
 
         public function jsonDel($key, $path = null): \Relay\Relay|false|int
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonDel(...\func_get_args());
+            return $this->initializeLazyObject()->jsonDel(...\func_get_args());
         }
 
         public function jsonForget($key, $path = null): \Relay\Relay|false|int
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonForget(...\func_get_args());
+            return $this->initializeLazyObject()->jsonForget(...\func_get_args());
         }
 
         public function jsonGet($key, $options = [], ...$paths): mixed
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonGet(...\func_get_args());
+            return $this->initializeLazyObject()->jsonGet(...\func_get_args());
         }
 
         public function jsonMerge($key, $path, $value): \Relay\Relay|bool
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonMerge(...\func_get_args());
+            return $this->initializeLazyObject()->jsonMerge(...\func_get_args());
         }
 
         public function jsonMget($key_or_array, $path): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonMget(...\func_get_args());
+            return $this->initializeLazyObject()->jsonMget(...\func_get_args());
         }
 
         public function jsonMset($key, $path, $value, ...$other_triples): \Relay\Relay|bool
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonMset(...\func_get_args());
+            return $this->initializeLazyObject()->jsonMset(...\func_get_args());
         }
 
         public function jsonNumIncrBy($key, $path, $value): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonNumIncrBy(...\func_get_args());
+            return $this->initializeLazyObject()->jsonNumIncrBy(...\func_get_args());
         }
 
         public function jsonNumMultBy($key, $path, $value): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonNumMultBy(...\func_get_args());
+            return $this->initializeLazyObject()->jsonNumMultBy(...\func_get_args());
         }
 
         public function jsonObjKeys($key, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonObjKeys(...\func_get_args());
+            return $this->initializeLazyObject()->jsonObjKeys(...\func_get_args());
         }
 
         public function jsonObjLen($key, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonObjLen(...\func_get_args());
+            return $this->initializeLazyObject()->jsonObjLen(...\func_get_args());
         }
 
         public function jsonResp($key, $path = null): \Relay\Relay|array|false|int|string
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonResp(...\func_get_args());
+            return $this->initializeLazyObject()->jsonResp(...\func_get_args());
         }
 
         public function jsonSet($key, $path, $value, $condition = null): \Relay\Relay|bool
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonSet(...\func_get_args());
+            return $this->initializeLazyObject()->jsonSet(...\func_get_args());
         }
 
         public function jsonStrAppend($key, $value, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonStrAppend(...\func_get_args());
+            return $this->initializeLazyObject()->jsonStrAppend(...\func_get_args());
         }
 
         public function jsonStrLen($key, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonStrLen(...\func_get_args());
+            return $this->initializeLazyObject()->jsonStrLen(...\func_get_args());
         }
 
         public function jsonToggle($key, $path): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonToggle(...\func_get_args());
+            return $this->initializeLazyObject()->jsonToggle(...\func_get_args());
         }
 
         public function jsonType($key, $path = null): \Relay\Relay|array|false
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->jsonType(...\func_get_args());
+            return $this->initializeLazyObject()->jsonType(...\func_get_args());
         }
     }
 } else {
@@ -150,7 +150,7 @@ trait RelayProxyTrait
     {
         public function copy($src, $dst, $options = null): \Relay\Relay|false|int
         {
-            return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy(...\func_get_args());
+            return $this->initializeLazyObject()->copy(...\func_get_args());
         }
     }
 }