Merge branch '6.4' into 7.1

derrabus · derrabus · commit 3c420edfe9ec · 2024-09-08T14:32:26.000+02:00
* 6.4:
  Mitigate PHPUnit deprecations
  [TwigBundle] Add support for resetting globals between HTTP requests
  Mitigate PHPUnit deprecations
  [Cache] Fix compatibility with Redis 6.1.0 pre-releases
  [Validator] Add Catalan and Spanish translation for `Week` constraint
  Don't use is_resource() on non-streams
  [Ldap] Fix extension deprecation
diff --git a/Traits/Redis6ProxyTrait.php b/Traits/Redis6ProxyTrait.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Cache\Traits;
 
-if (version_compare(phpversion('redis'), '6.1.0', '>=')) {
+if (version_compare(phpversion('redis'), '6.1.0-dev', '>=')) {
     /**
      * @internal
      */
@@ -27,7 +27,7 @@ public function hRandField($key, $options = null): \Redis|array|string|false
             return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hRandField(...\func_get_args());
         }
 
-        public function hSet($key, $fields_and_vals): \Redis|false|int
+        public function hSet($key, ...$fields_and_vals): \Redis|false|int
         {
             return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hSet(...\func_get_args());
         }
diff --git a/Traits/RedisCluster6ProxyTrait.php b/Traits/RedisCluster6ProxyTrait.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Cache\Traits;
 
-if (version_compare(phpversion('redis'), '6.1.0', '>')) {
+if (version_compare(phpversion('redis'), '6.1.0-dev', '>')) {
     /**
      * @internal
      */

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Cache\Traits;`
`13`	`13`
`14`		`-if (version_compare(phpversion('redis'), '6.1.0', '>=')) {`
	`14`	`+if (version_compare(phpversion('redis'), '6.1.0-dev', '>=')) {`
`15`	`15`	`/**`
`16`	`16`	`* @internal`
`17`	`17`	`*/`
`@@ -27,7 +27,7 @@ public function hRandField($key, $options = null): \Redis\|array\|string\|false`
`27`	`27`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hRandField(...\func_get_args());`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function hSet($key, $fields_and_vals): \Redis\|false\|int`
	`30`	`+ public function hSet($key, ...$fields_and_vals): \Redis\|false\|int`
`31`	`31`	`{`
`32`	`32`	`return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hSet(...\func_get_args());`
`33`	`33`	`}`