Merge branch '7.4' into 8.0

xabbuh · xabbuh · commit 0ee792d6388a · 2025-07-23T13:36:31.000+02:00
* 7.4:
  fix compatibility with Relay 0.11.1
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -778,6 +778,11 @@ public function isConnected(): bool
         return $this->initializeLazyObject()->isConnected(...\func_get_args());
     }
 
+    public function isTracked($key): bool
+    {
+        return $this->initializeLazyObject()->isTracked(...\func_get_args());
+    }
+
     public function jsonArrAppend($key, $value_or_array, $path = null): \Relay\Relay|array|false
     {
         return $this->initializeLazyObject()->jsonArrAppend(...\func_get_args());
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -43,7 +43,7 @@
     },
     "conflict": {
         "ext-redis": "<6.2",
-        "ext-relay": "<0.11",
+        "ext-relay": "<0.11.1",
         "doctrine/dbal": "<4.3"
     },
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -778,6 +778,11 @@ public function isConnected(): bool`
`778`	`778`	`return $this->initializeLazyObject()->isConnected(...\func_get_args());`
`779`	`779`	`}`
`780`	`780`
	`781`	`+ public function isTracked($key): bool`
	`782`	`+ {`
	`783`	`+ return $this->initializeLazyObject()->isTracked(...\func_get_args());`
	`784`	`+ }`
	`785`	`+`
`781`	`786`	`public function jsonArrAppend($key, $value_or_array, $path = null): \Relay\Relay\|array\|false`
`782`	`787`	`{`
`783`	`788`	`return $this->initializeLazyObject()->jsonArrAppend(...\func_get_args());`