From 6c1fbf86ae56ace773d4931ce852f6bdacf3df67 Mon Sep 17 00:00:00 2001 From: Pavlo Yatsukhnenko Date: Thu, 30 Oct 2025 17:09:58 +0200 Subject: [PATCH] Fix arginfo and stubs for RedisCluster --- redis_array_arginfo.h | 6 ++++-- redis_array_legacy_arginfo.h | 6 ++++-- redis_cluster.stub.php | 16 ++++++++-------- redis_cluster_arginfo.h | 18 +++++++++--------- redis_cluster_legacy_arginfo.h | 2 +- redis_sentinel_arginfo.h | 6 ++++-- redis_sentinel_legacy_arginfo.h | 6 ++++-- 7 files changed, 34 insertions(+), 26 deletions(-) diff --git a/redis_array_arginfo.h b/redis_array_arginfo.h index ab1ac840..ef433256 100644 --- a/redis_array_arginfo.h +++ b/redis_array_arginfo.h @@ -109,7 +109,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_RedisArray_zscan arginfo_class_RedisArray_hscan - ZEND_METHOD(RedisArray, __call); ZEND_METHOD(RedisArray, __construct); ZEND_METHOD(RedisArray, _continuum); @@ -142,7 +141,6 @@ ZEND_METHOD(RedisArray, unlink); ZEND_METHOD(RedisArray, unwatch); ZEND_METHOD(RedisArray, zscan); - static const zend_function_entry class_RedisArray_methods[] = { ZEND_ME(RedisArray, __call, arginfo_class_RedisArray___call, ZEND_ACC_PUBLIC) ZEND_ME(RedisArray, __construct, arginfo_class_RedisArray___construct, ZEND_ACC_PUBLIC) @@ -183,7 +181,11 @@ static zend_class_entry *register_class_RedisArray(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RedisArray", class_RedisArray_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } diff --git a/redis_array_legacy_arginfo.h b/redis_array_legacy_arginfo.h index 7fe38aa7..8f7f719d 100644 --- a/redis_array_legacy_arginfo.h +++ b/redis_array_legacy_arginfo.h @@ -105,7 +105,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_RedisArray_zscan arginfo_class_RedisArray_hscan - ZEND_METHOD(RedisArray, __call); ZEND_METHOD(RedisArray, __construct); ZEND_METHOD(RedisArray, _continuum); @@ -138,7 +137,6 @@ ZEND_METHOD(RedisArray, unlink); ZEND_METHOD(RedisArray, unwatch); ZEND_METHOD(RedisArray, zscan); - static const zend_function_entry class_RedisArray_methods[] = { ZEND_ME(RedisArray, __call, arginfo_class_RedisArray___call, ZEND_ACC_PUBLIC) ZEND_ME(RedisArray, __construct, arginfo_class_RedisArray___construct, ZEND_ACC_PUBLIC) @@ -179,7 +177,11 @@ static zend_class_entry *register_class_RedisArray(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RedisArray", class_RedisArray_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } diff --git a/redis_cluster.stub.php b/redis_cluster.stub.php index 63ba4d23..8ca60602 100644 --- a/redis_cluster.stub.php +++ b/redis_cluster.stub.php @@ -155,7 +155,7 @@ class RedisCluster { * * @see Redis::lmove */ - public function lmove(string $src, string $dst, string $wherefrom, string $whereto): Redis|string|false; + public function lmove(string $src, string $dst, string $wherefrom, string $whereto): RedisCluster|string|false; /** * Move an element from one list to another, blocking up to a timeout until an element is available. @@ -163,7 +163,7 @@ class RedisCluster { * @see Redis::blmove * */ - public function blmove(string $src, string $dst, string $wherefrom, string $whereto, float $timeout): Redis|string|false; + public function blmove(string $src, string $dst, string $wherefrom, string $whereto, float $timeout): RedisCluster|string|false; /** * @see Redis::bzpopmax @@ -538,12 +538,12 @@ class RedisCluster { /** * @see Redis::expiremember */ - public function expiremember(string $key, string $field, int $ttl, ?string $unit = null): Redis|int|false; + public function expiremember(string $key, string $field, int $ttl, ?string $unit = null): RedisCluster|int|false; /** * @see Redis::expirememberat */ - public function expirememberat(string $key, string $field, int $timestamp): Redis|int|false; + public function expirememberat(string $key, string $field, int $timestamp): RedisCluster|int|false; /** * @see https://redis.io/commands/hrandfield @@ -690,7 +690,7 @@ class RedisCluster { /** * @see Redis::lpos */ - public function lpos(string $key, mixed $value, ?array $options = null): Redis|null|bool|int|array; + public function lpos(string $key, mixed $value, ?array $options = null): RedisCluster|null|bool|int|array; /** * @see Redis::lpush @@ -1139,12 +1139,12 @@ class RedisCluster { /** * @see Redis::vgetattr */ - public function vgetattr(string $key, mixed $member, bool $decode = true): Redis|array|string|false; + public function vgetattr(string $key, mixed $member, bool $decode = true): RedisCluster|array|string|false; /** * @see Redis::vsetattr */ - public function vsetattr(string $key, mixed $member, array|string $attributes): Redis|int|false; + public function vsetattr(string $key, mixed $member, array|string $attributes): RedisCluster|int|false; /** * @see Redis::xack @@ -1346,7 +1346,7 @@ class RedisCluster { /** * @see https://redis.io/commands/zmscore */ - public function zmscore(string $key, mixed $member, mixed ...$other_members): Redis|array|false; + public function zmscore(string $key, mixed $member, mixed ...$other_members): RedisCluster|array|false; /** * @see Redis::zunionstore diff --git a/redis_cluster_arginfo.h b/redis_cluster_arginfo.h index d6cfd44f..1359082d 100644 --- a/redis_cluster_arginfo.h +++ b/redis_cluster_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6561a50ccac9841ac01a53feb5f88e7f592e1bc2 */ + * Stub hash: 5c64413b79e9df135d90d36ecb47ee391f36a448 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) @@ -101,14 +101,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_RedisCluster_brpoplpush, 0 ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lmove, 0, 4, Redis, MAY_BE_STRING|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lmove, 0, 4, RedisCluster, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, src, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, dst, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, wherefrom, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, whereto, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_blmove, 0, 5, Redis, MAY_BE_STRING|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_blmove, 0, 5, RedisCluster, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, src, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, dst, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, wherefrom, IS_STRING, 0) @@ -444,14 +444,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_RedisCluster_hscan, 0, 2, ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_expiremember, 0, 3, Redis, MAY_BE_LONG|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_expiremember, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, ttl, IS_LONG, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, unit, IS_STRING, 1, "null") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_expirememberat, 0, 3, Redis, MAY_BE_LONG|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_expirememberat, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0) @@ -562,7 +562,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lpop, 0, ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lpos, 0, 2, Redis, MAY_BE_NULL|MAY_BE_BOOL|MAY_BE_LONG|MAY_BE_ARRAY) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lpos, 0, 2, RedisCluster, MAY_BE_NULL|MAY_BE_BOOL|MAY_BE_LONG|MAY_BE_ARRAY) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null") @@ -934,13 +934,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_vlinks, 0 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, withscores, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_vgetattr, 0, 2, Redis, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_vgetattr, 0, 2, RedisCluster, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, member, IS_MIXED, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, decode, _IS_BOOL, 0, "true") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_vsetattr, 0, 3, Redis, MAY_BE_LONG|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_vsetattr, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, member, IS_MIXED, 0) ZEND_ARG_TYPE_MASK(0, attributes, MAY_BE_ARRAY|MAY_BE_STRING, NULL) @@ -1155,7 +1155,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zscore, 0 ZEND_ARG_TYPE_INFO(0, member, IS_MIXED, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zmscore, 0, 2, Redis, MAY_BE_ARRAY|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zmscore, 0, 2, RedisCluster, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, member, IS_MIXED, 0) ZEND_ARG_VARIADIC_TYPE_INFO(0, other_members, IS_MIXED, 0) diff --git a/redis_cluster_legacy_arginfo.h b/redis_cluster_legacy_arginfo.h index d61b36e6..fa5c60a6 100644 --- a/redis_cluster_legacy_arginfo.h +++ b/redis_cluster_legacy_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6561a50ccac9841ac01a53feb5f88e7f592e1bc2 */ + * Stub hash: 5c64413b79e9df135d90d36ecb47ee391f36a448 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1) ZEND_ARG_INFO(0, name) diff --git a/redis_sentinel_arginfo.h b/redis_sentinel_arginfo.h index 98762fce..c813d239 100644 --- a/redis_sentinel_arginfo.h +++ b/redis_sentinel_arginfo.h @@ -33,7 +33,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_RedisSentinel_slaves arginfo_class_RedisSentinel_ckquorum - ZEND_METHOD(RedisSentinel, __construct); ZEND_METHOD(RedisSentinel, ckquorum); ZEND_METHOD(RedisSentinel, failover); @@ -47,7 +46,6 @@ ZEND_METHOD(RedisSentinel, reset); ZEND_METHOD(RedisSentinel, sentinels); ZEND_METHOD(RedisSentinel, slaves); - static const zend_function_entry class_RedisSentinel_methods[] = { ZEND_ME(RedisSentinel, __construct, arginfo_class_RedisSentinel___construct, ZEND_ACC_PUBLIC) ZEND_ME(RedisSentinel, ckquorum, arginfo_class_RedisSentinel_ckquorum, ZEND_ACC_PUBLIC) @@ -69,7 +67,11 @@ static zend_class_entry *register_class_RedisSentinel(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RedisSentinel", class_RedisSentinel_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; } diff --git a/redis_sentinel_legacy_arginfo.h b/redis_sentinel_legacy_arginfo.h index c7582d6e..f6a641ef 100644 --- a/redis_sentinel_legacy_arginfo.h +++ b/redis_sentinel_legacy_arginfo.h @@ -32,7 +32,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_RedisSentinel_slaves arginfo_class_RedisSentinel_ckquorum - ZEND_METHOD(RedisSentinel, __construct); ZEND_METHOD(RedisSentinel, ckquorum); ZEND_METHOD(RedisSentinel, failover); @@ -46,7 +45,6 @@ ZEND_METHOD(RedisSentinel, reset); ZEND_METHOD(RedisSentinel, sentinels); ZEND_METHOD(RedisSentinel, slaves); - static const zend_function_entry class_RedisSentinel_methods[] = { ZEND_ME(RedisSentinel, __construct, arginfo_class_RedisSentinel___construct, ZEND_ACC_PUBLIC) ZEND_ME(RedisSentinel, ckquorum, arginfo_class_RedisSentinel_ckquorum, ZEND_ACC_PUBLIC) @@ -68,7 +66,11 @@ static zend_class_entry *register_class_RedisSentinel(void) zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "RedisSentinel", class_RedisSentinel_methods); +#if (PHP_VERSION_ID >= 80400) + class_entry = zend_register_internal_class_with_flags(&ce, NULL, 0); +#else class_entry = zend_register_internal_class_ex(&ce, NULL); +#endif return class_entry; }