From bd76e10e67a530c662b718ea15b1da4bbd24141c Mon Sep 17 00:00:00 2001 From: Adam Saponara Date: Tue, 11 Feb 2025 14:49:35 -0500 Subject: [PATCH] Fix stub of `RedisCluster::zremrangebyrank` --- redis_arginfo.h | 26 +++++++++++++++++++------- redis_cluster.stub.php | 2 +- redis_cluster_arginfo.h | 14 +++++++++----- redis_cluster_legacy_arginfo.h | 8 ++++---- redis_legacy_arginfo.h | 26 +++++++++++++++++++------- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/redis_arginfo.h b/redis_arginfo.h index 072e1fb715..bfcc5ce2a0 100644 --- a/redis_arginfo.h +++ b/redis_arginfo.h @@ -1,5 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 3c4051fdd9f860523bcd72aba260b1af823d1d9c */ + * Stub hash: e538a2a4594f37cda5e77021186efb696ceb83c3 */ + +ZEND_STATIC_ASSERT(PHP_VERSION_ID >= 80000, "redis_arginfo.h only supports PHP version ID 80000 or newer, " + "but it is included on an older PHP version"); ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null") @@ -1179,7 +1182,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_Redis_zunionstore arginfo_class_Redis_zinterstore - ZEND_METHOD(Redis, __construct); ZEND_METHOD(Redis, __destruct); ZEND_METHOD(Redis, _compress); @@ -1435,7 +1437,6 @@ ZEND_METHOD(Redis, zscan); ZEND_METHOD(Redis, zunion); ZEND_METHOD(Redis, zunionstore); - static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, __construct, arginfo_class_Redis___construct, ZEND_ACC_PUBLIC) ZEND_ME(Redis, __destruct, arginfo_class_Redis___destruct, ZEND_ACC_PUBLIC) @@ -1476,7 +1477,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, decr, arginfo_class_Redis_decr, ZEND_ACC_PUBLIC) ZEND_ME(Redis, decrBy, arginfo_class_Redis_decrBy, ZEND_ACC_PUBLIC) ZEND_ME(Redis, del, arginfo_class_Redis_del, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, delete, del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("delete", zim_Redis_del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("delete", zim_Redis_del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, discard, arginfo_class_Redis_discard, ZEND_ACC_PUBLIC) ZEND_ME(Redis, dump, arginfo_class_Redis_dump, ZEND_ACC_PUBLIC) ZEND_ME(Redis, echo, arginfo_class_Redis_echo, ZEND_ACC_PUBLIC) @@ -1572,7 +1577,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, msetnx, arginfo_class_Redis_msetnx, ZEND_ACC_PUBLIC) ZEND_ME(Redis, multi, arginfo_class_Redis_multi, ZEND_ACC_PUBLIC) ZEND_ME(Redis, object, arginfo_class_Redis_object, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, open, connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("open", zim_Redis_connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("open", zim_Redis_connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, pconnect, arginfo_class_Redis_pconnect, ZEND_ACC_PUBLIC) ZEND_ME(Redis, persist, arginfo_class_Redis_persist, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pexpire, arginfo_class_Redis_pexpire, ZEND_ACC_PUBLIC) @@ -1582,7 +1591,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, pfmerge, arginfo_class_Redis_pfmerge, ZEND_ACC_PUBLIC) ZEND_ME(Redis, ping, arginfo_class_Redis_ping, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pipeline, arginfo_class_Redis_pipeline, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, popen, pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("popen", zim_Redis_pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("popen", zim_Redis_pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, psetex, arginfo_class_Redis_psetex, ZEND_ACC_PUBLIC) ZEND_ME(Redis, psubscribe, arginfo_class_Redis_psubscribe, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pttl, arginfo_class_Redis_pttl, ZEND_ACC_PUBLIC) @@ -1697,7 +1710,6 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_FE_END }; - static const zend_function_entry class_RedisException_methods[] = { ZEND_FE_END }; diff --git a/redis_cluster.stub.php b/redis_cluster.stub.php index d5cab71f20..7060f7a3a1 100644 --- a/redis_cluster.stub.php +++ b/redis_cluster.stub.php @@ -1139,7 +1139,7 @@ public function zremrangebylex(string $key, string $min, string $max): RedisClus /** * @see Redis::zremrangebyrank */ - public function zremrangebyrank(string $key, string $min, string $max): RedisCluster|int|false; + public function zremrangebyrank(string $key, int $min, int $max): RedisCluster|int|false; /** * @see Redis::zremrangebyscore diff --git a/redis_cluster_arginfo.h b/redis_cluster_arginfo.h index 85079322bf..6987002329 100644 --- a/redis_cluster_arginfo.h +++ b/redis_cluster_arginfo.h @@ -1,5 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: b9310b607794caa862d509ba316a2a512d2736fe */ + * Stub hash: 8257c3e1ade1600e23ec089b3bf3e575d8c07464 */ + +ZEND_STATIC_ASSERT(PHP_VERSION_ID >= 80000, "redis_cluster_arginfo.h only supports PHP version ID 80000 or newer, " + "but it is included on an older PHP version"); ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) @@ -1003,7 +1006,11 @@ ZEND_END_ARG_INFO() #define arginfo_class_RedisCluster_zremrangebylex arginfo_class_RedisCluster_zlexcount -#define arginfo_class_RedisCluster_zremrangebyrank arginfo_class_RedisCluster_zlexcount +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zremrangebyrank, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, min, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, max, IS_LONG, 0) +ZEND_END_ARG_INFO() #define arginfo_class_RedisCluster_zremrangebyscore arginfo_class_RedisCluster_zlexcount @@ -1058,7 +1065,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zdiff, 0, ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null") ZEND_END_ARG_INFO() - ZEND_METHOD(RedisCluster, __construct); ZEND_METHOD(RedisCluster, _compress); ZEND_METHOD(RedisCluster, _uncompress); @@ -1286,7 +1292,6 @@ ZEND_METHOD(RedisCluster, zdiffstore); ZEND_METHOD(RedisCluster, zunion); ZEND_METHOD(RedisCluster, zdiff); - static const zend_function_entry class_RedisCluster_methods[] = { ZEND_ME(RedisCluster, __construct, arginfo_class_RedisCluster___construct, ZEND_ACC_PUBLIC) ZEND_ME(RedisCluster, _compress, arginfo_class_RedisCluster__compress, ZEND_ACC_PUBLIC) @@ -1517,7 +1522,6 @@ static const zend_function_entry class_RedisCluster_methods[] = { ZEND_FE_END }; - static const zend_function_entry class_RedisClusterException_methods[] = { ZEND_FE_END }; diff --git a/redis_cluster_legacy_arginfo.h b/redis_cluster_legacy_arginfo.h index 64d695108d..9f97715fb5 100644 --- a/redis_cluster_legacy_arginfo.h +++ b/redis_cluster_legacy_arginfo.h @@ -1,5 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: b9310b607794caa862d509ba316a2a512d2736fe */ + * Stub hash: 8257c3e1ade1600e23ec089b3bf3e575d8c07464 */ + +ZEND_STATIC_ASSERT(PHP_VERSION_ID >= 70000, "redis_cluster_arginfo.h only supports PHP version ID 70000 or newer, " + "but it is included on an older PHP version"); ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1) ZEND_ARG_INFO(0, name) @@ -900,7 +903,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster_zdiff, 0, 0, 1) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() - ZEND_METHOD(RedisCluster, __construct); ZEND_METHOD(RedisCluster, _compress); ZEND_METHOD(RedisCluster, _uncompress); @@ -1128,7 +1130,6 @@ ZEND_METHOD(RedisCluster, zdiffstore); ZEND_METHOD(RedisCluster, zunion); ZEND_METHOD(RedisCluster, zdiff); - static const zend_function_entry class_RedisCluster_methods[] = { ZEND_ME(RedisCluster, __construct, arginfo_class_RedisCluster___construct, ZEND_ACC_PUBLIC) ZEND_ME(RedisCluster, _compress, arginfo_class_RedisCluster__compress, ZEND_ACC_PUBLIC) @@ -1359,7 +1360,6 @@ static const zend_function_entry class_RedisCluster_methods[] = { ZEND_FE_END }; - static const zend_function_entry class_RedisClusterException_methods[] = { ZEND_FE_END }; diff --git a/redis_legacy_arginfo.h b/redis_legacy_arginfo.h index 27f0c44970..8f3090f4b6 100644 --- a/redis_legacy_arginfo.h +++ b/redis_legacy_arginfo.h @@ -1,5 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 3c4051fdd9f860523bcd72aba260b1af823d1d9c */ + * Stub hash: e538a2a4594f37cda5e77021186efb696ceb83c3 */ + +ZEND_STATIC_ASSERT(PHP_VERSION_ID >= 70000, "redis_arginfo.h only supports PHP version ID 70000 or newer, " + "but it is included on an older PHP version"); ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0) ZEND_ARG_INFO(0, options) @@ -1022,7 +1025,6 @@ ZEND_END_ARG_INFO() #define arginfo_class_Redis_zunionstore arginfo_class_Redis_zinterstore - ZEND_METHOD(Redis, __construct); ZEND_METHOD(Redis, __destruct); ZEND_METHOD(Redis, _compress); @@ -1278,7 +1280,6 @@ ZEND_METHOD(Redis, zscan); ZEND_METHOD(Redis, zunion); ZEND_METHOD(Redis, zunionstore); - static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, __construct, arginfo_class_Redis___construct, ZEND_ACC_PUBLIC) ZEND_ME(Redis, __destruct, arginfo_class_Redis___destruct, ZEND_ACC_PUBLIC) @@ -1319,7 +1320,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, decr, arginfo_class_Redis_decr, ZEND_ACC_PUBLIC) ZEND_ME(Redis, decrBy, arginfo_class_Redis_decrBy, ZEND_ACC_PUBLIC) ZEND_ME(Redis, del, arginfo_class_Redis_del, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, delete, del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("delete", zim_Redis_del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("delete", zim_Redis_del, arginfo_class_Redis_delete, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, discard, arginfo_class_Redis_discard, ZEND_ACC_PUBLIC) ZEND_ME(Redis, dump, arginfo_class_Redis_dump, ZEND_ACC_PUBLIC) ZEND_ME(Redis, echo, arginfo_class_Redis_echo, ZEND_ACC_PUBLIC) @@ -1415,7 +1420,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, msetnx, arginfo_class_Redis_msetnx, ZEND_ACC_PUBLIC) ZEND_ME(Redis, multi, arginfo_class_Redis_multi, ZEND_ACC_PUBLIC) ZEND_ME(Redis, object, arginfo_class_Redis_object, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, open, connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("open", zim_Redis_connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("open", zim_Redis_connect, arginfo_class_Redis_open, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, pconnect, arginfo_class_Redis_pconnect, ZEND_ACC_PUBLIC) ZEND_ME(Redis, persist, arginfo_class_Redis_persist, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pexpire, arginfo_class_Redis_pexpire, ZEND_ACC_PUBLIC) @@ -1425,7 +1434,11 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_ME(Redis, pfmerge, arginfo_class_Redis_pfmerge, ZEND_ACC_PUBLIC) ZEND_ME(Redis, ping, arginfo_class_Redis_ping, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pipeline, arginfo_class_Redis_pipeline, ZEND_ACC_PUBLIC) - ZEND_MALIAS(Redis, popen, pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#if (PHP_VERSION_ID >= 80400) + ZEND_RAW_FENTRY("popen", zim_Redis_pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL, NULL) +#else + ZEND_RAW_FENTRY("popen", zim_Redis_pconnect, arginfo_class_Redis_popen, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) +#endif ZEND_ME(Redis, psetex, arginfo_class_Redis_psetex, ZEND_ACC_PUBLIC) ZEND_ME(Redis, psubscribe, arginfo_class_Redis_psubscribe, ZEND_ACC_PUBLIC) ZEND_ME(Redis, pttl, arginfo_class_Redis_pttl, ZEND_ACC_PUBLIC) @@ -1540,7 +1553,6 @@ static const zend_function_entry class_Redis_methods[] = { ZEND_FE_END }; - static const zend_function_entry class_RedisException_methods[] = { ZEND_FE_END };