Merge pull request phpredis#1849 from phpredis/php8typehint

[RFE] use stub/arginfo

Author: yatsukhnenko

common.h

@@ -25,10 +25,17 @@
 
 #if PHP_VERSION_ID < 80000
     #define redis_hash_fetch_ops(zstr) php_hash_fetch_ops(ZSTR_VAL((zstr)), ZSTR_LEN((zstr)))
+
+    /* use RedisException when ValueError not available */
+    #define REDIS_VALUE_EXCEPTION(m) REDIS_THROW_EXCEPTION(m, 0)
+    #define RETURN_THROWS() RETURN_FALSE
 #else
     #define redis_hash_fetch_ops(zstr) php_hash_fetch_ops(zstr)
+
+    #define REDIS_VALUE_EXCEPTION(m) zend_value_error(m)
 #endif
 
+
 void redis_register_persistent_resource(zend_string *id, void *ptr, int le_id);
 
 PHP_REDIS_API int redis_extract_auth_info(zval *ztest, zend_string **user, zend_string **pass);

library.h

@@ -25,248 +25,6 @@
 /* phpredis version */
 #define PHP_REDIS_VERSION "5.3.2"
 
-PHP_METHOD(Redis, __construct);
-PHP_METHOD(Redis, __destruct);
-PHP_METHOD(Redis, acl);
-PHP_METHOD(Redis, append);
-PHP_METHOD(Redis, auth);
-PHP_METHOD(Redis, bgSave);
-PHP_METHOD(Redis, bgrewriteaof);
-PHP_METHOD(Redis, bitcount);
-PHP_METHOD(Redis, bitop);
-PHP_METHOD(Redis, bitpos);
-PHP_METHOD(Redis, blPop);
-PHP_METHOD(Redis, brPop);
-PHP_METHOD(Redis, bzPopMax);
-PHP_METHOD(Redis, bzPopMin);
-PHP_METHOD(Redis, close);
-PHP_METHOD(Redis, connect);
-PHP_METHOD(Redis, copy);
-PHP_METHOD(Redis, dbSize);
-PHP_METHOD(Redis, decr);
-PHP_METHOD(Redis, decrBy);
-PHP_METHOD(Redis, del);
-PHP_METHOD(Redis, echo);
-PHP_METHOD(Redis, exists);
-PHP_METHOD(Redis, expire);
-PHP_METHOD(Redis, expireAt);
-PHP_METHOD(Redis, flushAll);
-PHP_METHOD(Redis, flushDB);
-PHP_METHOD(Redis, get);
-PHP_METHOD(Redis, getBit);
-PHP_METHOD(Redis, getRange);
-PHP_METHOD(Redis, getSet);
-PHP_METHOD(Redis, incr);
-PHP_METHOD(Redis, incrBy);
-PHP_METHOD(Redis, incrByFloat);
-PHP_METHOD(Redis, info);
-PHP_METHOD(Redis, keys);
-PHP_METHOD(Redis, lInsert);
-PHP_METHOD(Redis, lLen);
-PHP_METHOD(Redis, lMove);
-PHP_METHOD(Redis, lPop);
-PHP_METHOD(Redis, lPush);
-PHP_METHOD(Redis, lPushx);
-PHP_METHOD(Redis, lSet);
-PHP_METHOD(Redis, lastSave);
-PHP_METHOD(Redis, lindex);
-PHP_METHOD(Redis, lrange);
-PHP_METHOD(Redis, lrem);
-PHP_METHOD(Redis, ltrim);
-PHP_METHOD(Redis, mget);
-PHP_METHOD(Redis, move);
-PHP_METHOD(Redis, object);
-PHP_METHOD(Redis, pconnect);
-PHP_METHOD(Redis, persist);
-PHP_METHOD(Redis, pexpire);
-PHP_METHOD(Redis, pexpireAt);
-PHP_METHOD(Redis, ping);
-PHP_METHOD(Redis, psetex);
-PHP_METHOD(Redis, pttl);
-PHP_METHOD(Redis, rPop);
-PHP_METHOD(Redis, rPush);
-PHP_METHOD(Redis, rPushx);
-PHP_METHOD(Redis, randomKey);
-PHP_METHOD(Redis, rename);
-PHP_METHOD(Redis, renameNx);
-PHP_METHOD(Redis, sAdd);
-PHP_METHOD(Redis, sAddArray);
-PHP_METHOD(Redis, sDiff);
-PHP_METHOD(Redis, sDiffStore);
-PHP_METHOD(Redis, sInter);
-PHP_METHOD(Redis, sInterStore);
-PHP_METHOD(Redis, sMembers);
-PHP_METHOD(Redis, sMisMember);
-PHP_METHOD(Redis, sMove);
-PHP_METHOD(Redis, sPop);
-PHP_METHOD(Redis, sRandMember);
-PHP_METHOD(Redis, sUnion);
-PHP_METHOD(Redis, sUnionStore);
-PHP_METHOD(Redis, save);
-PHP_METHOD(Redis, scard);
-PHP_METHOD(Redis, select);
-PHP_METHOD(Redis, set);
-PHP_METHOD(Redis, setBit);
-PHP_METHOD(Redis, setRange);
-PHP_METHOD(Redis, setex);
-PHP_METHOD(Redis, setnx);
-PHP_METHOD(Redis, sismember);
-PHP_METHOD(Redis, slaveof);
-PHP_METHOD(Redis, sort);
-PHP_METHOD(Redis, sortAsc);
-PHP_METHOD(Redis, sortAscAlpha);
-PHP_METHOD(Redis, sortDesc);
-PHP_METHOD(Redis, sortDescAlpha);
-PHP_METHOD(Redis, srem);
-PHP_METHOD(Redis, strlen);
-PHP_METHOD(Redis, swapdb);
-PHP_METHOD(Redis, ttl);
-PHP_METHOD(Redis, type);
-PHP_METHOD(Redis, unlink);
-PHP_METHOD(Redis, zAdd);
-PHP_METHOD(Redis, zCard);
-PHP_METHOD(Redis, zCount);
-PHP_METHOD(Redis, zIncrBy);
-PHP_METHOD(Redis, zLexCount);
-PHP_METHOD(Redis, zMscore);
-PHP_METHOD(Redis, zPopMax);
-PHP_METHOD(Redis, zPopMin);
-PHP_METHOD(Redis, zRange);
-PHP_METHOD(Redis, zRangeByLex);
-PHP_METHOD(Redis, zRangeByScore);
-PHP_METHOD(Redis, zRank);
-PHP_METHOD(Redis, zRem);
-PHP_METHOD(Redis, zRemRangeByLex);
-PHP_METHOD(Redis, zRemRangeByRank);
-PHP_METHOD(Redis, zRemRangeByScore);
-PHP_METHOD(Redis, zRevRange);
-PHP_METHOD(Redis, zRevRangeByLex);
-PHP_METHOD(Redis, zRevRangeByScore);
-PHP_METHOD(Redis, zRevRank);
-PHP_METHOD(Redis, zScore);
-PHP_METHOD(Redis, zdiff);
-PHP_METHOD(Redis, zdiffstore);
-PHP_METHOD(Redis, zinter);
-PHP_METHOD(Redis, zinterstore);
-PHP_METHOD(Redis, zunion);
-PHP_METHOD(Redis, zunionstore);
-
-PHP_METHOD(Redis, eval);
-PHP_METHOD(Redis, evalsha);
-PHP_METHOD(Redis, script);
-PHP_METHOD(Redis, debug);
-PHP_METHOD(Redis, dump);
-PHP_METHOD(Redis, restore);
-PHP_METHOD(Redis, migrate);
-
-PHP_METHOD(Redis, time);
-PHP_METHOD(Redis, role);
-
-PHP_METHOD(Redis, getLastError);
-PHP_METHOD(Redis, clearLastError);
-PHP_METHOD(Redis, _prefix);
-PHP_METHOD(Redis, _pack);
-PHP_METHOD(Redis, _unpack);
-
-PHP_METHOD(Redis, _serialize);
-PHP_METHOD(Redis, _unserialize);
-
-PHP_METHOD(Redis, _compress);
-PHP_METHOD(Redis, _uncompress);
-
-PHP_METHOD(Redis, mset);
-PHP_METHOD(Redis, msetnx);
-PHP_METHOD(Redis, rpoplpush);
-PHP_METHOD(Redis, brpoplpush);
-
-PHP_METHOD(Redis, hGet);
-PHP_METHOD(Redis, hSet);
-PHP_METHOD(Redis, hSetNx);
-PHP_METHOD(Redis, hDel);
-PHP_METHOD(Redis, hLen);
-PHP_METHOD(Redis, hKeys);
-PHP_METHOD(Redis, hVals);
-PHP_METHOD(Redis, hGetAll);
-PHP_METHOD(Redis, hExists);
-PHP_METHOD(Redis, hIncrBy);
-PHP_METHOD(Redis, hIncrByFloat);
-PHP_METHOD(Redis, hMset);
-PHP_METHOD(Redis, hMget);
-PHP_METHOD(Redis, hStrLen);
-
-PHP_METHOD(Redis, multi);
-PHP_METHOD(Redis, discard);
-PHP_METHOD(Redis, exec);
-PHP_METHOD(Redis, watch);
-PHP_METHOD(Redis, unwatch);
-
-PHP_METHOD(Redis, pipeline);
-
-PHP_METHOD(Redis, publish);
-PHP_METHOD(Redis, subscribe);
-PHP_METHOD(Redis, psubscribe);
-PHP_METHOD(Redis, unsubscribe);
-PHP_METHOD(Redis, punsubscribe);
-
-PHP_METHOD(Redis, getOption);
-PHP_METHOD(Redis, setOption);
-
-PHP_METHOD(Redis, config);
-PHP_METHOD(Redis, slowlog);
-PHP_METHOD(Redis, wait);
-PHP_METHOD(Redis, pubsub);
-
-/* Geoadd and friends */
-PHP_METHOD(Redis, geoadd);
-PHP_METHOD(Redis, geohash);
-PHP_METHOD(Redis, geopos);
-PHP_METHOD(Redis, geodist);
-PHP_METHOD(Redis, georadius);
-PHP_METHOD(Redis, georadius_ro);
-PHP_METHOD(Redis, georadiusbymember);
-PHP_METHOD(Redis, georadiusbymember_ro);
-
-PHP_METHOD(Redis, client);
-PHP_METHOD(Redis, command);
-PHP_METHOD(Redis, rawcommand);
-
-/* SCAN and friends  */
-PHP_METHOD(Redis, scan);
-PHP_METHOD(Redis, hscan);
-PHP_METHOD(Redis, sscan);
-PHP_METHOD(Redis, zscan);
-
-/* HyperLogLog commands */
-PHP_METHOD(Redis, pfadd);
-PHP_METHOD(Redis, pfcount);
-PHP_METHOD(Redis, pfmerge);
-
-/* STREAMS */
-PHP_METHOD(Redis, xack);
-PHP_METHOD(Redis, xadd);
-PHP_METHOD(Redis, xclaim);
-PHP_METHOD(Redis, xdel);
-PHP_METHOD(Redis, xgroup);
-PHP_METHOD(Redis, xinfo);
-PHP_METHOD(Redis, xlen);
-PHP_METHOD(Redis, xpending);
-PHP_METHOD(Redis, xrange);
-PHP_METHOD(Redis, xread);
-PHP_METHOD(Redis, xreadgroup);
-PHP_METHOD(Redis, xrevrange);
-PHP_METHOD(Redis, xtrim);
-
-/* Reflection */
-PHP_METHOD(Redis, getHost);
-PHP_METHOD(Redis, getPort);
-PHP_METHOD(Redis, getDBNum);
-PHP_METHOD(Redis, getTimeout);
-PHP_METHOD(Redis, getReadTimeout);
-PHP_METHOD(Redis, isConnected);
-PHP_METHOD(Redis, getPersistentID);
-PHP_METHOD(Redis, getAuth);
-PHP_METHOD(Redis, getMode);
-
 /* For convenience we store the salt as a printable hex string which requires 2
  * characters per byte + 1 for the NULL terminator */
 #define REDIS_SALT_BYTES 32