Skip to content

Commit 046fedc

Browse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.3
* 6.4: Fix Warning: curl_multi_select(): timeout must be positive [PropertyInfo] Fix ReflectionExtractor handling of underscore-only property names ObjectNormalizer: allow null and scalar [Security] Fix `HttpUtils::createRequest()` when the context’s base URL isn’t empty [Serializer] fix Inherited properties normalization [OptionsResolver] Fix missing prototype key in nested error paths Bump Symfony version to 6.4.30 Update VERSION for 6.4.29 Update CHANGELOG for 6.4.29 [Yaml] Fix parsing of unquoted multiline scalars with comments or blank lines [Clock] Align MockClock::sleep() behavior with NativeClock for negative values [OptionsResolver] Ensure remove() also unsets deprecation status Remove review state for Belarusian translations (entries 141 and 142) [ExpressionLanguage] Compile numbers with var_export in Compiler::repr for thread-safety compatibility with ext-redis 6.3 [Serializer] Fix BackedEnumNormalizer behavior with partial denormalization
2 parents 1277a1e + f021d84 commit 046fedc

File tree

4 files changed

+326
-0
lines changed

4 files changed

+326
-0
lines changed

‎Traits/Redis63ProxyTrait.php‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Cache\Traits;
13+
14+
if (version_compare(phpversion('redis'), '6.3.0', '>=')) {
15+
/**
16+
* @internal
17+
*/
18+
trait Redis63ProxyTrait
19+
{
20+
public function delifeq($key, $value): \Redis|int|false
21+
{
22+
return $this->initializeLazyObject()->delifeq(...\func_get_args());
23+
}
24+
25+
public function hexpire($key, $ttl, $fields, $mode = null): \Redis|array|false
26+
{
27+
return $this->initializeLazyObject()->hexpire(...\func_get_args());
28+
}
29+
30+
public function hexpireat($key, $time, $fields, $mode = null): \Redis|array|false
31+
{
32+
return $this->initializeLazyObject()->hexpireat(...\func_get_args());
33+
}
34+
35+
public function hexpiretime($key, $fields): \Redis|array|false
36+
{
37+
return $this->initializeLazyObject()->hexpiretime(...\func_get_args());
38+
}
39+
40+
public function hgetdel($key, $fields): \Redis|array|false
41+
{
42+
return $this->initializeLazyObject()->hgetdel(...\func_get_args());
43+
}
44+
45+
public function hgetex($key, $fields, $expiry = null): \Redis|array|false
46+
{
47+
return $this->initializeLazyObject()->hgetex(...\func_get_args());
48+
}
49+
50+
public function hGetWithMeta($key, $member): mixed
51+
{
52+
return $this->initializeLazyObject()->hGetWithMeta(...\func_get_args());
53+
}
54+
55+
public function hpersist($key, $fields): \Redis|array|false
56+
{
57+
return $this->initializeLazyObject()->hpersist(...\func_get_args());
58+
}
59+
60+
public function hpexpire($key, $ttl, $fields, $mode = null): \Redis|array|false
61+
{
62+
return $this->initializeLazyObject()->hpexpire(...\func_get_args());
63+
}
64+
65+
public function hpexpireat($key, $mstime, $fields, $mode = null): \Redis|array|false
66+
{
67+
return $this->initializeLazyObject()->hpexpireat(...\func_get_args());
68+
}
69+
70+
public function hpexpiretime($key, $fields): \Redis|array|false
71+
{
72+
return $this->initializeLazyObject()->hpexpiretime(...\func_get_args());
73+
}
74+
75+
public function hpttl($key, $fields): \Redis|array|false
76+
{
77+
return $this->initializeLazyObject()->hpttl(...\func_get_args());
78+
}
79+
80+
public function hsetex($key, $fields, $expiry = null): \Redis|int|false
81+
{
82+
return $this->initializeLazyObject()->hsetex(...\func_get_args());
83+
}
84+
85+
public function httl($key, $fields): \Redis|array|false
86+
{
87+
return $this->initializeLazyObject()->httl(...\func_get_args());
88+
}
89+
90+
public function vadd($key, $values, $element, $options = null): \Redis|int|false
91+
{
92+
return $this->initializeLazyObject()->vadd(...\func_get_args());
93+
}
94+
95+
public function vcard($key): \Redis|int|false
96+
{
97+
return $this->initializeLazyObject()->vcard(...\func_get_args());
98+
}
99+
100+
public function vdim($key): \Redis|int|false
101+
{
102+
return $this->initializeLazyObject()->vdim(...\func_get_args());
103+
}
104+
105+
public function vemb($key, $member, $raw = false): \Redis|array|false
106+
{
107+
return $this->initializeLazyObject()->vemb(...\func_get_args());
108+
}
109+
110+
public function vgetattr($key, $member, $decode = true): \Redis|array|string|false
111+
{
112+
return $this->initializeLazyObject()->vgetattr(...\func_get_args());
113+
}
114+
115+
public function vinfo($key): \Redis|array|false
116+
{
117+
return $this->initializeLazyObject()->vinfo(...\func_get_args());
118+
}
119+
120+
public function vismember($key, $member): \Redis|bool
121+
{
122+
return $this->initializeLazyObject()->vismember(...\func_get_args());
123+
}
124+
125+
public function vlinks($key, $member, $withscores = false): \Redis|array|false
126+
{
127+
return $this->initializeLazyObject()->vlinks(...\func_get_args());
128+
}
129+
130+
public function vrandmember($key, $count = 0): \Redis|array|string|false
131+
{
132+
return $this->initializeLazyObject()->vrandmember(...\func_get_args());
133+
}
134+
135+
public function vrange($key, $min, $max, $count = -1): \Redis|array|false
136+
{
137+
return $this->initializeLazyObject()->vrange(...\func_get_args());
138+
}
139+
140+
public function vrem($key, $member): \Redis|int|false
141+
{
142+
return $this->initializeLazyObject()->vrem(...\func_get_args());
143+
}
144+
145+
public function vsetattr($key, $member, $attributes): \Redis|int|false
146+
{
147+
return $this->initializeLazyObject()->vsetattr(...\func_get_args());
148+
}
149+
150+
public function vsim($key, $member, $options = null): \Redis|array|false
151+
{
152+
return $this->initializeLazyObject()->vsim(...\func_get_args());
153+
}
154+
}
155+
} else {
156+
/**
157+
* @internal
158+
*/
159+
trait Redis63ProxyTrait
160+
{
161+
}
162+
}

‎Traits/Redis6Proxy.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
2626
{
2727
use Redis61ProxyTrait;
2828
use Redis62ProxyTrait;
29+
use Redis63ProxyTrait;
2930
use RedisProxyTrait {
3031
resetLazyObject as reset;
3132
}

‎Traits/RedisCluster63ProxyTrait.php‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Cache\Traits;
13+
14+
if (version_compare(phpversion('redis'), '6.3.0', '>=')) {
15+
/**
16+
* @internal
17+
*/
18+
trait RedisCluster63ProxyTrait
19+
{
20+
public function delifeq($key, $value): \RedisCluster|int|false
21+
{
22+
return $this->initializeLazyObject()->delifeq(...\func_get_args());
23+
}
24+
25+
public function hexpire($key, $ttl, $fields, $mode = null): \RedisCluster|array|false
26+
{
27+
return $this->initializeLazyObject()->hexpire(...\func_get_args());
28+
}
29+
30+
public function hexpireat($key, $time, $fields, $mode = null): \RedisCluster|array|false
31+
{
32+
return $this->initializeLazyObject()->hexpireat(...\func_get_args());
33+
}
34+
35+
public function hexpiretime($key, $fields): \RedisCluster|array|false
36+
{
37+
return $this->initializeLazyObject()->hexpiretime(...\func_get_args());
38+
}
39+
40+
public function hgetdel($key, $fields): \RedisCluster|array|false
41+
{
42+
return $this->initializeLazyObject()->hgetdel(...\func_get_args());
43+
}
44+
45+
public function hgetex($key, $fields, $expiry = null): \RedisCluster|array|false
46+
{
47+
return $this->initializeLazyObject()->hgetex(...\func_get_args());
48+
}
49+
50+
public function hgetWithMeta($key, $member): mixed
51+
{
52+
return $this->initializeLazyObject()->hgetWithMeta(...\func_get_args());
53+
}
54+
55+
public function hpersist($key, $fields): \RedisCluster|array|false
56+
{
57+
return $this->initializeLazyObject()->hpersist(...\func_get_args());
58+
}
59+
60+
public function hpexpire($key, $ttl, $fields, $mode = null): \RedisCluster|array|false
61+
{
62+
return $this->initializeLazyObject()->hpexpire(...\func_get_args());
63+
}
64+
65+
public function hpexpireat($key, $mstime, $fields, $mode = null): \RedisCluster|array|false
66+
{
67+
return $this->initializeLazyObject()->hpexpireat(...\func_get_args());
68+
}
69+
70+
public function hpexpiretime($key, $fields): \RedisCluster|array|false
71+
{
72+
return $this->initializeLazyObject()->hpexpiretime(...\func_get_args());
73+
}
74+
75+
public function hpttl($key, $fields): \RedisCluster|array|false
76+
{
77+
return $this->initializeLazyObject()->hpttl(...\func_get_args());
78+
}
79+
80+
public function hsetex($key, $fields, $expiry = null): \RedisCluster|int|false
81+
{
82+
return $this->initializeLazyObject()->hsetex(...\func_get_args());
83+
}
84+
85+
public function httl($key, $fields): \RedisCluster|array|false
86+
{
87+
return $this->initializeLazyObject()->httl(...\func_get_args());
88+
}
89+
90+
public function vadd($key, $values, $element, $options = null): \RedisCluster|int|false
91+
{
92+
return $this->initializeLazyObject()->vadd(...\func_get_args());
93+
}
94+
95+
public function vcard($key): \RedisCluster|int|false
96+
{
97+
return $this->initializeLazyObject()->vcard(...\func_get_args());
98+
}
99+
100+
public function vdim($key): \RedisCluster|int|false
101+
{
102+
return $this->initializeLazyObject()->vdim(...\func_get_args());
103+
}
104+
105+
public function vemb($key, $member, $raw = false): \RedisCluster|array|false
106+
{
107+
return $this->initializeLazyObject()->vemb(...\func_get_args());
108+
}
109+
110+
public function vgetattr($key, $member, $decode = true): \RedisCluster|array|string|false
111+
{
112+
return $this->initializeLazyObject()->vgetattr(...\func_get_args());
113+
}
114+
115+
public function vinfo($key): \RedisCluster|array|false
116+
{
117+
return $this->initializeLazyObject()->vinfo(...\func_get_args());
118+
}
119+
120+
public function vismember($key, $member): \RedisCluster|bool
121+
{
122+
return $this->initializeLazyObject()->vismember(...\func_get_args());
123+
}
124+
125+
public function vlinks($key, $member, $withscores = false): \RedisCluster|array|false
126+
{
127+
return $this->initializeLazyObject()->vlinks(...\func_get_args());
128+
}
129+
130+
public function vrandmember($key, $count = 0): \RedisCluster|array|string|false
131+
{
132+
return $this->initializeLazyObject()->vrandmember(...\func_get_args());
133+
}
134+
135+
public function vrange($key, $min, $max, $count = -1): \RedisCluster|array|false
136+
{
137+
return $this->initializeLazyObject()->vrange(...\func_get_args());
138+
}
139+
140+
public function vrem($key, $member): \RedisCluster|int|false
141+
{
142+
return $this->initializeLazyObject()->vrem(...\func_get_args());
143+
}
144+
145+
public function vsetattr($key, $member, $attributes): \RedisCluster|int|false
146+
{
147+
return $this->initializeLazyObject()->vsetattr(...\func_get_args());
148+
}
149+
150+
public function vsim($key, $member, $options = null): \RedisCluster|array|false
151+
{
152+
return $this->initializeLazyObject()->vsim(...\func_get_args());
153+
}
154+
}
155+
} else {
156+
/**
157+
* @internal
158+
*/
159+
trait RedisCluster63ProxyTrait
160+
{
161+
}
162+
}

‎Traits/RedisCluster6Proxy.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class RedisCluster6Proxy extends \RedisCluster implements ResetInterface, LazyOb
2626
{
2727
use RedisCluster61ProxyTrait;
2828
use RedisCluster62ProxyTrait;
29+
use RedisCluster63ProxyTrait;
2930
use RedisProxyTrait {
3031
resetLazyObject as reset;
3132
}

0 commit comments

Comments
 (0)