diff --git a/resources/functionMap.php b/resources/functionMap.php
index 82789aea05..ce14659ea1 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -8825,19 +8825,19 @@
 'RedisCluster::append' => ['int', 'key'=>'string', 'value'=>'string'],
 'RedisCluster::bgrewriteaof' => ['bool', 'nodeParams'=>'string'],
 'RedisCluster::bgsave' => ['bool', 'nodeParams'=>'string'],
-'RedisCluster::bitCount' => ['int', 'key'=>'string'],
+'RedisCluster::bitCount' => ['int', 'key'=>'string', 'start='=>'int', 'end='=>'int', 'bybit='=>'bool'],
 'RedisCluster::bitOp' => ['int', 'operation'=>'string', 'retKey'=>'string', 'key1'=>'string', 'key2'=>'string', 'key3='=>'string'],
-'RedisCluster::bitpos' => ['int', 'key'=>'string', 'bit'=>'int', 'start='=>'int', 'end='=>'int'],
-'RedisCluster::blPop' => ['array', 'keys'=>'array', 'timeout'=>'int'],
-'RedisCluster::brPop' => ['array', 'keys'=>'array', 'timeout'=>'int'],
+'RedisCluster::bitpos' => ['int', 'key'=>'string', 'bit'=>'int', 'start='=>'int', 'end='=>'int', 'bybit='=>'bool'],
+'RedisCluster::blPop' => ['array', 'keys'=>'array', 'timeout'=>'int', '...extra_args='=>'mixed'],
+'RedisCluster::brPop' => ['array', 'keys'=>'array', 'timeout'=>'int', '...extra_args='=>'mixed'],
 'RedisCluster::brpoplpush' => ['string', 'srcKey'=>'string', 'dstKey'=>'string', 'timeout'=>'int'],
 'RedisCluster::client' => ['', 'nodeParams'=>'string', 'subCmd'=>'', 'args'=>''],
 'RedisCluster::close' => [''],
 'RedisCluster::cluster' => ['mixed', 'nodeParams'=>'string', 'command'=>'string', 'arguments'=>'mixed'],
 'RedisCluster::command' => ['mixed'],
-'RedisCluster::config' => ['array', 'nodeParams'=>'string', 'operation'=>'string', 'key'=>'string', 'value'=>'string'],
+'RedisCluster::config' => ['array', 'nodeParams'=>'string', 'operation'=>'string', 'key'=>'string', 'value'=>'string', '...extra_args='=>'mixed'],
 'RedisCluster::dbSize' => ['int', 'nodeParams'=>'string'],
-'RedisCluster::decr' => ['int', 'key'=>'string'],
+'RedisCluster::decr' => ['int', 'key'=>'string', 'by='=>'int'],
 'RedisCluster::decrBy' => ['int', 'key'=>'string', 'value'=>'int'],
 'RedisCluster::del' => ['int', 'key1'=>'int|string', 'key2='=>'int|string', 'key3='=>'int|string'],
 'RedisCluster::discard' => [''],
@@ -8845,15 +8845,15 @@
 'RedisCluster::echo' => ['mixed', 'nodeParams'=>'string', 'msg'=>'string'],
 'RedisCluster::eval' => ['mixed', 'script'=>'', 'args='=>'', 'numKeys='=>''],
 'RedisCluster::exec' => ['array|void'],
-'RedisCluster::exists' => ['bool', 'key'=>'string'],
-'RedisCluster::expire' => ['bool', 'key'=>'string', 'ttl'=>'int'],
-'RedisCluster::expireAt' => ['bool', 'key'=>'string', 'timestamp'=>'int'],
-'RedisCluster::flushAll' => ['bool', 'nodeParams'=>'string'],
-'RedisCluster::flushDB' => ['bool', 'nodeParams'=>'string'],
-'RedisCluster::geoAdd' => ['', 'key'=>'string', 'longitude'=>'float', 'latitude'=>'float', 'member'=>'string'],
+'RedisCluster::exists' => ['bool', 'key'=>'string', '...other_keys='=>'mixed'],
+'RedisCluster::expire' => ['bool', 'key'=>'string', 'ttl'=>'int', 'mode='=>'string|null'],
+'RedisCluster::expireAt' => ['bool', 'key'=>'string', 'timestamp'=>'int', 'mode='=>'string|null'],
+'RedisCluster::flushAll' => ['bool', 'nodeParams'=>'string', 'async='=>'bool'],
+'RedisCluster::flushDB' => ['bool', 'nodeParams'=>'string', 'async='=>'bool'],
+'RedisCluster::geoAdd' => ['', 'key'=>'string', 'longitude'=>'float', 'latitude'=>'float', 'member'=>'string', '...other_triples_and_options='=>'mixed'],
 'RedisCluster::geoDist' => ['', 'key'=>'string', 'member1'=>'string', 'member2'=>'string', 'unit='=>'string'],
-'RedisCluster::geohash' => ['', 'key'=>'', 'member1'=>'', 'member2='=>'mixed', 'memberN='=>'mixed'],
-'RedisCluster::geopos' => ['', 'key'=>'', 'member1'=>'', 'member2='=>'mixed', 'memberN='=>'mixed'],
+'RedisCluster::geohash' => ['', 'key'=>'', 'member1'=>'', 'member2='=>'mixed', 'memberN='=>'mixed', '...other_members='=>'string'],
+'RedisCluster::geopos' => ['', 'key'=>'', 'member1'=>'', 'member2='=>'mixed', 'memberN='=>'mixed', '...other_members='=>'string'],
 'RedisCluster::geoRadius' => ['', 'key'=>'string', 'longitude'=>'float', 'latitude'=>'float', 'radius'=>'float', 'radiusUnit'=>'string', 'options'=>'array'],
 'RedisCluster::geoRadiusByMember' => ['', 'key'=>'string', 'member'=>'string', 'radius'=>'float', 'radiusUnit'=>'string', 'options'=>'array'],
 'RedisCluster::get' => ['bool|string', 'key'=>'string'],
@@ -8862,7 +8862,7 @@
 'RedisCluster::getOption' => ['int', 'name'=>'int'],
 'RedisCluster::getRange' => ['string', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
 'RedisCluster::getSet' => ['string', 'key'=>'string', 'value'=>'string'],
-'RedisCluster::hDel' => ['int', 'key'=>'string', 'hashKey1'=>'string', 'hashKey2='=>'string', 'hashKeyN='=>'string'],
+'RedisCluster::hDel' => ['int', 'key'=>'string', 'hashKey1'=>'string', 'hashKey2='=>'string', 'hashKeyN='=>'string', '...other_members='=>'string'],
 'RedisCluster::hExists' => ['bool', 'key'=>'string', 'hashKey'=>'string'],
 'RedisCluster::hGet' => ['string', 'key'=>'string', 'hashKey'=>'string'],
 'RedisCluster::hGetAll' => ['array', 'key'=>'string'],
@@ -8876,18 +8876,18 @@
 'RedisCluster::hSet' => ['int', 'key'=>'string', 'hashKey'=>'string', 'value'=>'string'],
 'RedisCluster::hSetNx' => ['bool', 'key'=>'string', 'hashKey'=>'string', 'value'=>'string'],
 'RedisCluster::hVals' => ['array', 'key'=>'string'],
-'RedisCluster::incr' => ['int', 'key'=>'string'],
+'RedisCluster::incr' => ['int', 'key'=>'string', 'by='=>'int'],
 'RedisCluster::incrBy' => ['int', 'key'=>'string', 'value'=>'int'],
 'RedisCluster::incrByFloat' => ['float', 'key'=>'string', 'increment'=>'float'],
-'RedisCluster::info' => ['string', 'option='=>'string'],
+'RedisCluster::info' => ['string', 'key_or_address='=>'string|array', '...sections='=>'string'],
 'RedisCluster::keys' => ['array', 'pattern'=>'string'],
 'RedisCluster::lastSave' => ['int', 'nodeParams'=>'string'],
 'RedisCluster::lGet' => ['', 'key'=>'string', 'index'=>'int'],
 'RedisCluster::lIndex' => ['string', 'key'=>'string', 'index'=>'int'],
 'RedisCluster::lInsert' => ['int', 'key'=>'string', 'position'=>'int', 'pivot'=>'string', 'value'=>'string'],
 'RedisCluster::lLen' => ['int', 'key'=>'string'],
-'RedisCluster::lPop' => ['string', 'key'=>'string'],
-'RedisCluster::lPush' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
+'RedisCluster::lPop' => ['string', 'key'=>'string', 'count='=>'int'],
+'RedisCluster::lPush' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string', '...other_values='=>'mixed'],
 'RedisCluster::lPushx' => ['int', 'key'=>'string', 'value'=>'string'],
 'RedisCluster::lRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
 'RedisCluster::lRem' => ['int', 'key'=>'string', 'value'=>'string', 'count'=>'int'],
@@ -8899,34 +8899,34 @@
 'RedisCluster::multi' => ['__benevolent<RedisCluster|bool>', 'mode='=>'int'],
 'RedisCluster::object' => ['string', 'string='=>'string', 'key='=>'string'],
 'RedisCluster::persist' => ['bool', 'key'=>'string'],
-'RedisCluster::pExpire' => ['bool', 'key'=>'string', 'ttl'=>'int'],
-'RedisCluster::pExpireAt' => ['bool', 'key'=>'string', 'timestamp'=>'int'],
+'RedisCluster::pExpire' => ['bool', 'key'=>'string', 'ttl'=>'int', 'mode='=>'string|null'],
+'RedisCluster::pExpireAt' => ['bool', 'key'=>'string', 'timestamp'=>'int', 'mode='=>'string|null'],
 'RedisCluster::pfAdd' => ['bool', 'key'=>'string', 'elements'=>'array'],
 'RedisCluster::pfCount' => ['int', 'key'=>'string'],
 'RedisCluster::pfMerge' => ['bool', 'destKey'=>'string', 'sourceKeys'=>'array'],
-'RedisCluster::ping' => ['string', 'nodeParams'=>'string'],
+'RedisCluster::ping' => ['string', 'nodeParams'=>'string', 'message='=>'string|null'],
 'RedisCluster::psetex' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
 'RedisCluster::psubscribe' => ['mixed', 'patterns'=>'array', 'callback'=>'string'],
 'RedisCluster::pttl' => ['int', 'key'=>'string'],
 'RedisCluster::publish' => ['int', 'channel'=>'string', 'message'=>'string'],
 'RedisCluster::pubsub' => ['array', 'nodeParams'=>'string', 'keyword'=>'string', '...argument='=>'string'],
-'RedisCluster::punSubscribe' => ['', 'channels'=>'', 'callback'=>''],
+'RedisCluster::punSubscribe' => ['', 'channels'=>'', 'callback'=>'', 'pattern='=>'string', '...other_patterns='=>'string'],
 'RedisCluster::randomKey' => ['string', 'nodeParams'=>'string'],
-'RedisCluster::rawCommand' => ['mixed', 'nodeParams'=>'string', 'command'=>'string', 'arguments'=>'mixed'],
+'RedisCluster::rawCommand' => ['mixed', 'key_or_address='=>'string|array', 'command'=>'string', '...arguments'=>'mixed'],
 'RedisCluster::rename' => ['bool', 'srcKey'=>'string', 'dstKey'=>'string'],
 'RedisCluster::renameNx' => ['bool', 'srcKey'=>'string', 'dstKey'=>'string'],
-'RedisCluster::restore' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
+'RedisCluster::restore' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string', 'options='=>'array|null'],
 'RedisCluster::role' => ['array', 'nodeParams'=>'string'],
-'RedisCluster::rPop' => ['string', 'key'=>'string'],
+'RedisCluster::rPop' => ['string', 'key'=>'string', 'count='=>'int'],
 'RedisCluster::rpoplpush' => ['string', 'srcKey'=>'string', 'dstKey'=>'string'],
-'RedisCluster::rPush' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
+'RedisCluster::rPush' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string', '...elements='=>'mixed'],
 'RedisCluster::rPushx' => ['int', 'key'=>'string', 'value'=>'string'],
-'RedisCluster::sAdd' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
+'RedisCluster::sAdd' => ['int', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string', '...other_values='=>'mixed'],
 'RedisCluster::sAddArray' => ['int', 'key'=>'string', 'valueArray'=>'array'],
 'RedisCluster::save' => ['bool', 'nodeParams'=>'string'],
 'RedisCluster::scan' => ['array|bool', '&iterator'=>'int|null', 'key_or_address' => 'string|array', 'pattern='=>'string', 'count='=>'int'],
 'RedisCluster::sCard' => ['int', 'key'=>'string'],
-'RedisCluster::script' => ['mixed', 'nodeParams'=>'string', 'command'=>'string', 'script'=>'string'],
+'RedisCluster::script' => ['mixed', 'nodeParams'=>'string', 'command'=>'string', 'script'=>'string', '...args='=>'mixed'],
 'RedisCluster::sDiff' => ['list<string>', 'key1'=>'string', 'key2'=>'string', '...other_keys='=>'string'],
 'RedisCluster::sDiffStore' => ['int', 'dstKey'=>'string', 'key1'=>'string', '...other_keys='=>'string'],
 'RedisCluster::set' => ['bool', 'key'=>'string', 'value'=>'string', 'timeout='=>'array|int'],
@@ -8937,11 +8937,11 @@
 'RedisCluster::sInter' => ['list<string>', 'key'=>'string', '...other_keys='=>'string'],
 'RedisCluster::sInterStore' => ['int', 'dstKey'=>'string', 'key'=>'string', '...other_keys='=>'string'],
 'RedisCluster::sIsMember' => ['bool', 'key'=>'string', 'value'=>'string'],
-'RedisCluster::slowLog' => ['', 'nodeParams'=>'string', 'command'=>'string', 'argument'=>'mixed', '...other_arguments='=>'mixed'],
+'RedisCluster::slowLog' => ['', 'nodeParams'=>'string', 'command'=>'string', 'argument'=>'mixed', '...other_arguments='=>'mixed', '...args='=>'mixed'],
 'RedisCluster::sMembers' => ['list<string>', 'key'=>'string'],
 'RedisCluster::sMove' => ['bool', 'srcKey'=>'string', 'dstKey'=>'string', 'member'=>'string'],
 'RedisCluster::sort' => ['array', 'key'=>'string', 'option='=>'array'],
-'RedisCluster::sPop' => ['string', 'key'=>'string'],
+'RedisCluster::sPop' => ['string', 'key'=>'string', 'count='=>'int'],
 'RedisCluster::sRandMember' => ['array|string', 'key'=>'string', 'count='=>'int'],
 'RedisCluster::sRem' => ['int', 'key'=>'string', 'member1'=>'string', '...other_members='=>'string'],
 'RedisCluster::sScan' => ['array', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'null', 'count='=>'int'],
@@ -8960,22 +8960,22 @@
 'RedisCluster::xadd' => ['', 'str_key'=>'string', 'str_id'=>'string', 'arr_fields'=>'array', 'i_maxlen='=>'', 'boo_approximate='=>''],
 'RedisCluster::xclaim' => ['', 'str_key'=>'string', 'str_group'=>'string', 'str_consumer'=>'string', 'i_min_idle'=>'', 'arr_ids'=>'array', 'arr_opts='=>'array'],
 'RedisCluster::xdel' => ['', 'str_key'=>'string', 'arr_ids'=>'array'],
-'RedisCluster::xgroup' => ['', 'str_operation'=>'string', 'str_key='=>'string', 'str_arg1='=>'', 'str_arg2='=>'', 'str_arg3='=>''],
-'RedisCluster::xinfo' => ['', 'str_cmd'=>'string', 'str_key='=>'string', 'str_group='=>'string'],
+'RedisCluster::xgroup' => ['', 'str_operation'=>'string', 'str_key='=>'string', 'str_arg1='=>'', 'str_arg2='=>'', 'str_arg3='=>'', 'entries_read='=>'int'],
+'RedisCluster::xinfo' => ['', 'str_cmd'=>'string', 'str_key='=>'string', 'str_group='=>'string', 'count='=>'int'],
 'RedisCluster::xlen' => ['', 'key'=>''],
 'RedisCluster::xpending' => ['', 'str_key'=>'string', 'str_group'=>'string', 'str_start='=>'', 'str_end='=>'', 'i_count='=>'', 'str_consumer='=>'string'],
 'RedisCluster::xrange' => ['', 'str_key'=>'string', 'str_start'=>'', 'str_end'=>'', 'i_count='=>''],
 'RedisCluster::xread' => ['', 'arr_streams'=>'array', 'i_count='=>'', 'i_block='=>''],
 'RedisCluster::xreadgroup' => ['', 'str_group'=>'string', 'str_consumer'=>'string', 'arr_streams'=>'array', 'i_count='=>'', 'i_block='=>''],
 'RedisCluster::xrevrange' => ['', 'str_key'=>'string', 'str_start'=>'', 'str_end'=>'', 'i_count='=>''],
-'RedisCluster::xtrim' => ['', 'str_key'=>'string', 'i_maxlen'=>'', 'boo_approximate='=>''],
-'RedisCluster::zAdd' => ['int', 'key'=>'string', 'score1'=>'float', 'value1'=>'string', 'score2='=>'float', 'value2='=>'string', 'scoreN='=>'float', 'valueN='=>'string'],
+'RedisCluster::xtrim' => ['', 'str_key'=>'string', 'i_maxlen'=>'', 'boo_approximate='=>'', 'minid='=>'bool', 'limit='=>'int'],
+'RedisCluster::zAdd' => ['int', 'key'=>'string', 'score1'=>'float', 'value1'=>'string', 'score2='=>'float', 'value2='=>'string', 'scoreN='=>'float', 'valueN='=>'string', '...more_scores_and_mems='=>'mixed'],
 'RedisCluster::zCard' => ['int', 'key'=>'string'],
 'RedisCluster::zCount' => ['int', 'key'=>'string', 'start'=>'string', 'end'=>'string'],
 'RedisCluster::zIncrBy' => ['float', 'key'=>'string', 'value'=>'float', 'member'=>'string'],
 'RedisCluster::zInterStore' => ['int', 'Output'=>'string', 'ZSetKeys'=>'array', 'Weights='=>'?array', 'aggregateFunction='=>'string'],
 'RedisCluster::zLexCount' => ['int', 'key'=>'string', 'min'=>'int', 'max'=>'int'],
-'RedisCluster::zRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscores='=>'bool'],
+'RedisCluster::zRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscores='=>'bool', 'options='=>'array|bool|null'],
 'RedisCluster::zRangeByLex' => ['array', 'key'=>'string', 'min'=>'int', 'max'=>'int', 'offset='=>'int', 'limit='=>'int'],
 'RedisCluster::zRangeByScore' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'options='=>'array'],
 'RedisCluster::zRank' => ['int', 'key'=>'string', 'member'=>'string'],
@@ -8983,8 +8983,8 @@
 'RedisCluster::zRemRangeByLex' => ['array', 'key'=>'string', 'min'=>'int', 'max'=>'int'],
 'RedisCluster::zRemRangeByRank' => ['int', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
 'RedisCluster::zRemRangeByScore' => ['int', 'key'=>'string', 'start'=>'float|string', 'end'=>'float|string'],
-'RedisCluster::zRevRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscore='=>'bool'],
-'RedisCluster::zRevRangeByLex' => ['array', 'key'=>'string', 'min'=>'int', 'max'=>'int', 'offset='=>'int', 'limit='=>'int'],
+'RedisCluster::zRevRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscore='=>'bool', 'options='=>'array|null'],
+'RedisCluster::zRevRangeByLex' => ['array', 'key'=>'string', 'min'=>'int', 'max'=>'int', 'offset='=>'int', 'limit='=>'int', 'options='=>'array|null'],
 'RedisCluster::zRevRangeByScore' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'options='=>'array'],
 'RedisCluster::zRevRank' => ['int', 'key'=>'string', 'member'=>'string'],
 'RedisCluster::zScan' => ['array', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'string', 'count='=>'int'],