diff --git a/resources/functionMap.php b/resources/functionMap.php
index f5b20ec457..7afd6ed3fb 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -9467,222 +9467,269 @@
 'RecursiveTreeIterator::setPostfix' => ['void', 'prefix'=>'string'],
 'RecursiveTreeIterator::setPrefixPart' => ['void', 'part'=>'int', 'prefix'=>'string'],
 'RecursiveTreeIterator::valid' => ['bool'],
-'Redis::__construct' => ['void'],
-'Redis::_prefix' => ['string', 'value'=>'mixed'],
-'Redis::_serialize' => ['mixed', 'value'=>'mixed'],
-'Redis::_unserialize' => ['mixed', 'value'=>'string'],
-'Redis::append' => ['int', 'key'=>'string', 'value'=>'string'],
-'Redis::auth' => ['bool', 'password'=>'string|string[]'],
-'Redis::bgRewriteAOF' => ['bool'],
-'Redis::bgSave' => ['bool'],
-'Redis::bitCount' => ['int', 'key'=>'string'],
-'Redis::bitOp' => ['int', 'operation'=>'string', '...args'=>'string'],
-'Redis::bitpos' => ['int', 'key'=>'string', 'bit'=>'int', 'start='=>'int', 'end='=>'int'],
-'Redis::blPop' => ['array', 'keys'=>'string[]', 'timeout'=>'int'],
+'Redis::__construct' => ['void', 'options='=>'?array{host?:string,port?:int,connectTimeout?:float,auth?:list{string|null|false,string}|list{string},ssl?:array<string, mixed>,backoff?:array<string, mixed>}'],
+'Redis::_compress' => ['string', 'value'=>'string'],
+'Redis::_uncompress' => ['string', 'value'=>'string'],
+'Redis::_prefix' => ['string', 'key'=>'mixed'],
+'Redis::_serialize' => ['mixed', 'value'=>'string'],
+'Redis::_unserialize' => ['string', 'value'=>'mixed'],
+'Redis::_pack' => ['mixed', 'value'=>'string'],
+'Redis::_unpack' => ['string', 'value'=>'mixed'],
+'Redis::acl' => ['mixed', 'subcmd'=>'string', '...args='=>'string'],
+'Redis::append' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'string'],
+'Redis::auth' => ['__benevolent<Redis|bool>', 'credentials'=>'string|string[]'],
+'Redis::bgrewriteaof' => ['__benevolent<Redis|bool>'],
+'Redis::bgSave' => ['__benevolent<Redis|bool>'],
+'Redis::bitcount' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'start='=>'int', 'end='=>'int', 'bybit='=>'bool'],
+'Redis::bitop' => ['__benevolent<Redis|int|false>', 'operation'=>'string', 'deskey'=>'string', 'srckey'=>'string', '...other_keys'=>'string'],
+'Redis::bitpos' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'bit'=>'bool', 'start='=>'int', 'end='=>'int', 'bybit='=>'bool'],
+'Redis::blmove' => ['__benevolent<Redis|string|false>', 'src'=>'string', 'dst'=>'string', 'wherefrom'=>'string', 'whereto'=>'string', 'timeout'=>'float'],
+'Redis::blmpop' => ['__benevolent<Redis|mixed[]|null|false>', 'timeout'=>'float', 'keys'=>'string[]', 'from'=>'string', 'count='=>'int'],
+'Redis::blPop' => ['__benevolent<Redis|mixed[]|null|false>', 'key_or_keys'=>'string|string[]', 'timeout_or_key'=>'string|float|int', '...extra_args'=>'mixed'],
 'Redis::blPop\'1' => ['array', 'key'=>'string', 'timeout_or_key'=>'int|string', '...extra_args'=>'int|string'],
-'Redis::brPop' => ['array', 'keys'=>'string[]', 'timeout'=>'int'],
+'Redis::brPop' => ['__benevolent<Redis|mixed[]|null|false>', 'key_or_keys'=>'string|string[]', 'timeout_or_key'=>'string|float|int', '...extra_args'=>'mixed'],
 'Redis::brPop\'1' => ['array', 'key'=>'string', 'timeout_or_key'=>'int|string', '...extra_args'=>'int|string'],
-'Redis::brpoplpush' => ['string|false', 'srcKey'=>'string', 'dstKey'=>'string', 'timeout'=>'int'],
+'Redis::brpoplpush' => ['__benevolent<Redis|string|false>', 'src'=>'string', 'dst'=>'string', 'timeout'=>'int|float'],
+'Redis::bzPopMax' => ['__benevolent<Redis|mixed[]|false>', 'key'=>'string|string[]', 'timeout_or_key'=>'string|int', '...extra_args'=>'mixed'],
+'Redis::bzPopMin' => ['__benevolent<Redis|mixed[]|false>', 'key'=>'string|string[]', 'timeout_or_key'=>'string|int', '...extra_args'=>'mixed'],
+'Redis::bzmpop' => ['__benevolent<Redis|mixed[]|null|false>', 'timeout'=>'float', 'keys'=>'string[]', 'from'=>'string', 'count='=>'int'],
 'Redis::clearLastError' => ['bool'],
-'Redis::client' => ['mixed', 'command'=>'string', 'arg='=>'string'],
+'Redis::clearTransferredBytes' => ['void'],
+'Redis::client' => ['mixed', 'opt'=>'string', '...args='=>'mixed'],
 'Redis::close' => ['bool'],
-'Redis::config' => ['string', 'operation'=>'string', 'key'=>'string', 'value='=>'string'],
-'Redis::connect' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'?string', 'retry_interval='=>'?int', 'read_timeout='=>'float', 'context='=>'?array{auth?:list{string|null|false,string}|list{string},stream?:array<string,mixed>}'],
-'Redis::dbSize' => ['int'],
-'Redis::decr' => ['int', 'key'=>'string'],
-'Redis::decrBy' => ['int', 'key'=>'string', 'value'=>'int'],
+'Redis::command' => ['mixed', 'opt='=>'?string', '...args'=>'mixed'],
+'Redis::config' => ['mixed', 'operation'=>'string', 'key_or_settings='=>'array<string, mixed>|string[]|string|null', 'value='=>'?string'],
+'Redis::connect' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'?string', 'retry_interval='=>'int', 'read_timeout='=>'float', 'context='=>'?array{auth?:list{string|null|false,string}|list{string},stream?:array<string,mixed>}'],
+'Redis::copy' => ['__benevolent<Redis|bool>', 'src'=>'string', 'dst'=>'string', 'options='=>'?array<string, mixed>'],
+'Redis::dbSize' => ['__benevolent<Redis|int|false>'],
+'Redis::debug' => ['__benevolent<Redis|string>', 'key'=>'string'],
+'Redis::decr' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'by='=>'int'],
+'Redis::decrBy' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'int'],
 'Redis::decrByFloat' => ['float', 'key'=>'string', 'value'=>'float'],
-'Redis::del' => ['int', 'key'=>'string', '...args'=>'string'],
+'Redis::del' => ['__benevolent<Redis|int|false>', 'key'=>'string[]|string', '...other_keys='=>'string'],
 'Redis::del\'1' => ['int', 'key'=>'string[]'],
-'Redis::delete' => ['int', 'key'=>'string', '...args'=>'string'],
+'Redis::delete' => ['__benevolent<Redis|int|false>', 'key'=>'string[]|string', '...other_keys='=>'string'],
 'Redis::delete\'1' => ['int', 'key'=>'string[]'],
-'Redis::discard' => [''],
-'Redis::dump' => ['string|false', 'key'=>'string'],
-'Redis::echo' => ['string', 'message'=>'string'],
-'Redis::eval' => ['mixed', 'script'=>'', 'args='=>'', 'numKeys='=>''],
-'Redis::evalSha' => ['mixed', 'scriptSha'=>'string', 'args='=>'array', 'numKeys='=>'int'],
+'Redis::discard' => ['__benevolent<Redis|bool>'],
+'Redis::dump' => ['__benevolent<Redis|string>', 'key'=>'string'],
+'Redis::echo' => ['__benevolent<Redis|string|false>', 'str'=>'string'],
+'Redis::eval' => ['mixed', 'script'=>'string', 'args='=>'array', 'num_keys='=>'int'],
+'Redis::eval_ro' => ['mixed', 'script'=>'string', 'args='=>'array', 'num_keys='=>'int'],
+'Redis::evalsha' => ['mixed', 'sha1'=>'string', 'args='=>'array', 'num_keys='=>'int'],
+'Redis::evalsha_ro' => ['mixed', 'sha1'=>'string', 'args='=>'array', 'num_keys='=>'int'],
 'Redis::evaluate' => ['mixed', 'script'=>'string', 'args='=>'array', 'numKeys='=>'int'],
-'Redis::evaluateSha' => ['', 'scriptSha'=>'string', 'args='=>'array', 'numKeys='=>'int'],
-'Redis::exec' => ['array'],
-'Redis::exists' => ['int', 'keys'=>'string|string[]'],
+'Redis::exec' => ['__benevolent<Redis|mixed[]|false>'],
+'Redis::exists' => ['__benevolent<Redis|int|bool>', 'keys'=>'string|string[]', '...other_keys='=>'string'],
 'Redis::exists\'1' => ['int', '...keys'=>'string'],
-'Redis::expire' => ['bool', 'key'=>'string', 'ttl'=>'int'],
-'Redis::expireAt' => ['bool', 'key'=>'string', 'expiry'=>'int'],
-'Redis::flushAll' => ['bool', 'async='=>'bool'],
-'Redis::flushDb' => ['bool', 'async='=>'bool'],
-'Redis::geoAdd' => ['int', 'key'=>'string', 'longitude'=>'float', 'latitude'=>'float', 'member'=>'string', '...other_triples='=>'string|int|float'],
-'Redis::geoDist' => ['float', 'key'=>'string', 'member1'=>'string', 'member2'=>'string', 'unit='=>'string'],
-'Redis::geoHash' => ['array<int,string>', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
-'Redis::geoPos' => ['array<int,array{0:string,1:string}>', 'key'=>'string', 'member'=>'string', '...members'=>'string'],
-'Redis::geoRadius' => ['array<int,mixed>|int', 'key'=>'string', 'longitude'=>'float', 'latitude'=>'float', 'radius'=>'float', 'unit'=>'float', 'options='=>'array<string,mixed>'],
-'Redis::geoRadiusByMember' => ['array<int,mixed>|int', 'key'=>'string', 'member'=>'string', 'radius'=>'float', 'units'=>'string', 'options='=>'array<string,mixed>'],
+'Redis::expire' => ['__benevolent<Redis|bool>', 'key'=>'string', 'timeout'=>'int', 'mode='=>'?string'],
+'Redis::expireAt' => ['__benevolent<Redis|bool>', 'key'=>'string', 'timeout'=>'int', 'mode='=>'?string'],
+'Redis::expiretime' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::failover' => ['__benevolent<Redis|bool>', 'to='=>'?array', 'abort='=>'bool', 'timeout='=>'int'],
+'Redis::fcall' => ['mixed', 'fn'=>'string', 'keys='=>'string[]', 'args='=>'array'],
+'Redis::fcall_ro' => ['mixed', 'fn'=>'string', 'keys='=>'string[]', 'args='=>'array'],
+'Redis::flushAll' => ['__benevolent<Redis|bool>', 'sync='=>'?bool'],
+'Redis::flushDb' => ['__benevolent<Redis|bool>', 'sync='=>'?bool'],
+'Redis::function' => ['__benevolent<Redis|bool|string|array>', 'operation'=>'string', '...args='=>'mixed'],
+'Redis::geoadd' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'lng'=>'float', 'lat'=>'float', 'member'=>'string', '...other_triples_and_options='=>'mixed'],
+'Redis::geodist' => ['__benevolent<Redis|float|false>', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
+'Redis::geohash' => ['__benevolent<Redis|array<int,string>|false>', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
+'Redis::geopos' => ['__benevolent<Redis|array<int,array{0:string,1:string}>|false>', 'key'=>'string', 'member'=>'string', '...other_members'=>'string'],
+'Redis::georadius' => ['__benevolent<Redis|array<int,mixed>>', 'key'=>'string', 'lng'=>'float', 'lat'=>'float', 'radius'=>'float', 'unit'=>'string', 'options='=>'array<string,mixed>'],
+'Redis::georadiusbymember' => ['__benevolent<Redis|array<int,mixed>>', 'key'=>'string', 'lng'=>'float', 'lat'=>'float', 'radius'=>'float', 'unit'=>'string', 'options='=>'array<string,mixed>'],
+'Redis::georadiusbymember_ro' => ['__benevolent<Redis|array<int,mixed>>', 'key'=>'string', 'lng'=>'float', 'lat'=>'float', 'radius'=>'float', 'unit'=>'string', 'options='=>'array<string,mixed>'],
+'Redis::geosearch' => ['__benevolent<Redis|array<int,mixed>>', 'key'=>'string', 'position'=>'array<int,array{0:string,1:string}>|string', 'shape'=>'array<int,array{0:string,1:string}>|int|float', 'unit'=>'string', 'options='=>'array<string,mixed>'],
+'Redis::geosearchstore' => ['__benevolent<Redis|array<int,mixed>|int|false>', 'dst'=>'string', 'src'=>'string', 'position'=>'array<int,array{0:string,1:string}>|string', 'shape'=>'array<int,array{0:string,1:string}>|int|float', 'unit'=>'string', 'options='=>'array<string,mixed>'],
 'Redis::get' => ['string|false', 'key'=>'string'],
 'Redis::getAuth' => ['string|false|null'],
-'Redis::getBit' => ['int', 'key'=>'string', 'offset'=>'int'],
+'Redis::getBit' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'idx'=>'int'],
+'Redis::getEx' => ['__benevolent<Redis|string|bool>', 'key'=>'string', 'options'=>'?array{EX?:int,PX?:int,EXAT?:int,PXAT?:int,PERSIST?:bool}'],
+'Redis::getDBNum' => ['int'],
+'Redis::getDel' => ['__benevolent<Redis|string|bool>', 'key'=>'string'],
+'Redis::getHost' => ['string'],
 'Redis::getKeys' => ['array<int,string>', 'pattern'=>'string'],
-'Redis::getLastError' => ['null|string'],
+'Redis::getLastError' => ['?string'],
 'Redis::getMode' => ['int'],
 'Redis::getMultiple' => ['array', 'keys'=>'string[]'],
 'Redis::getOption' => ['int', 'name'=>'int'],
-'Redis::getRange' => ['int', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
-'Redis::getSet' => ['string', 'key'=>'string', 'string'=>'string'],
-'Redis::hDel' => ['int|false', 'key'=>'string', 'hashKey1'=>'string', '...otherHashKeys='=>'string'],
-'Redis::hExists' => ['bool', 'key'=>'string', 'hashKey'=>'string'],
-'Redis::hGet' => ['string|false', 'key'=>'string', 'hashKey'=>'string'],
-'Redis::hGetAll' => ['array', 'key'=>'string'],
-'Redis::hIncrBy' => ['int', 'key'=>'string', 'hashKey'=>'string', 'value'=>'int'],
-'Redis::hIncrByFloat' => ['float', 'key'=>'string', 'field'=>'string', 'increment'=>'float'],
-'Redis::hKeys' => ['array', 'key'=>'string'],
-'Redis::hLen' => ['int|false', 'key'=>'string'],
-'Redis::hMGet' => ['array', 'key'=>'string', 'hashKeys'=>'array'],
-'Redis::hMSet' => ['bool', 'key'=>'string', 'hashKeys'=>'array'],
-'Redis::hScan' => ['array', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'string', 'count='=>'int'],
-'Redis::hSet' => ['int|false', 'key'=>'string', 'hashKey'=>'string', 'value'=>'string'],
-'Redis::hSetNx' => ['bool', 'key'=>'string', 'hashKey'=>'string', 'value'=>'string'],
-'Redis::hVals' => ['array', 'key'=>'string'],
-'Redis::incr' => ['int', 'key'=>'string'],
-'Redis::incrBy' => ['int', 'key'=>'string', 'value'=>'int'],
-'Redis::incrByFloat' => ['float', 'key'=>'string', 'value'=>'float'],
-'Redis::info' => ['array', 'option='=>'string'],
-'Redis::keys' => ['array<int,string>', 'pattern'=>'string'],
+'Redis::getPersistentID' => ['?string'],
+'Redis::getPort' => ['int'],
+'Redis::getRange' => ['__benevolent<Redis|string|false>', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
+'Redis::getReadTimeout' => ['float'],
+'Redis::getset' => ['__benevolent<Redis|string|false>', 'key'=>'string', 'value'=>'mixed'],
+'Redis::getTimeout' => ['float|false'],
+'Redis::getTransferredBytes' => ['array<int,array{0:int,1:int}>'],
+'Redis::hDel' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'field'=>'string', '...other_fields='=>'string'],
+'Redis::hExists' => ['__benevolent<Redis|bool>', 'key'=>'string', 'field'=>'string'],
+'Redis::hGet' => ['__benevolent<Redis|string|false>', 'key'=>'string', 'member'=>'string'],
+'Redis::hGetAll' => ['__benevolent<Redis|string[]|false>', 'key'=>'string'],
+'Redis::hIncrBy' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'field'=>'string', 'value'=>'int'],
+'Redis::hIncrByFloat' => ['__benevolent<Redis|float|false>', 'key'=>'string', 'field'=>'string', 'value'=>'float'],
+'Redis::hKeys' => ['__benevolent<Redis|string[]|false>', 'key'=>'string'],
+'Redis::hLen' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::hMget' => ['__benevolent<Redis|array<string, mixed>|false>', 'key'=>'string', 'fields'=>'string[]'],
+'Redis::hMset' => ['__benevolent<Redis|bool>', 'key'=>'string', 'fieldvals'=>'array<string, mixed>'],
+'Redis::hRandField' => ['__benevolent<Redis|string|array<string, mixed>>', 'key'=>'string', 'options'=>'?array{COUNT?:int,WITHVALUES?:bool}'],
+'Redis::hscan' => ['__benevolent<Redis|array<string, mixed>|bool>', 'key'=>'string', '&iterator'=>'?int', 'pattern='=>'?string', 'count='=>'int'],
+'Redis::hSet' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'member'=>'string', 'value'=>'mixed'],
+'Redis::hSetNx' => ['__benevolent<Redis|bool>', 'key'=>'string', 'field'=>'string', 'value'=>'string'],
+'Redis::hStrLen' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'field'=>'string'],
+'Redis::hVals' => ['__benevolent<Redis|string[]|false>', 'key'=>'string'],
+'Redis::incr' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'by='=>'int'],
+'Redis::incrBy' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'int'],
+'Redis::incrByFloat' => ['__benevolent<Redis|float|false>', 'key'=>'string', 'value'=>'float'],
+'Redis::info' => ['__benevolent<Redis|array<string, mixed>|false>', '...sections='=>'string'],
+'Redis::isConnected' => ['bool'],
+'Redis::keys' => ['__benevolent<Redis|array<int, string>|false>', 'pattern'=>'string'],
 'Redis::lastSave' => ['int'],
+'Redis::lcs' => ['__benevolent<Redis|string|array|int|false>', 'key1'=>'string', 'key2'=>'string', 'options'=>'?array{MINMATCHLEN?:int,WITHMATCHLEN?:bool,LEN?:bool,IDX?:bool}'],
 'Redis::lGet' => ['', 'key'=>'string', 'index'=>'int'],
 'Redis::lGetRange' => ['', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
-'Redis::lIndex' => ['string|false', 'key'=>'string', 'index'=>'int'],
-'Redis::lInsert' => ['int', 'key'=>'string', 'position'=>'int', 'pivot'=>'string', 'value'=>'string'],
+'Redis::lindex' => ['null|string|false', 'key'=>'string', 'index'=>'int'],
+'Redis::lInsert' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'pos'=>'int', 'pivot'=>'mixed', 'value'=>'mixed'],
 'Redis::listTrim' => ['', 'key'=>'string', 'start'=>'int', 'stop'=>'int'],
-'Redis::lLen' => ['int|false', 'key'=>'string'],
-'Redis::lPop' => ['string', 'key'=>'string'],
-'Redis::lPush' => ['int|false', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
-'Redis::lPushx' => ['int|false', 'key'=>'string', 'value'=>'string'],
-'Redis::lRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
-'Redis::lRem' => ['int|false', 'key'=>'string', 'value'=>'string', 'count'=>'int'],
-'Redis::lRemove' => ['', 'key'=>'string', 'value'=>'string', 'count'=>'int'],
-'Redis::lSet' => ['bool', 'key'=>'string', 'index'=>'int', 'value'=>'string'],
+'Redis::lLen' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::lMove' => ['__benevolent<Redis|string|false>', 'src'=>'string', 'dst'=>'string', 'wherefrom'=>'string', 'whereto'=>'string'],
+'Redis::lmpop' => ['__benevolent<Redis|array<int, mixed>|null|false>', 'keys'=>'string[]', 'from'=>'string', 'count='=>'int'],
+'Redis::lPop' => ['__benevolent<Redis|bool|string|mixed[]>', 'key'=>'string', 'count='=>'int'],
+'Redis::lPos' => ['__benevolent<Redis|null|bool|int|mixed[]>', 'key'=>'string', 'value'=>'mixed', 'options'=>'?array{COUNT?:int,RANK?:int,MAXLEN?:int}'],
+'Redis::lPush' => ['__benevolent<Redis|int|false>', 'key'=>'string', '...elements='=>'mixed'],
+'Redis::lPushx' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'mixed'],
+'Redis::lrange' => ['__benevolent<Redis|mixed[]|false>', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
+'Redis::lrem' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'mixed', 'count='=>'int'],
+'Redis::lSet' => ['__benevolent<Redis|bool>', 'key'=>'string', 'index'=>'int', 'value'=>'mixed'],
 'Redis::lSize' => ['', 'key'=>'string'],
-'Redis::lTrim' => ['array|false', 'key'=>'string', 'start'=>'int', 'stop'=>'int'],
-'Redis::mGet' => ['array', 'keys'=>'string[]'],
-'Redis::migrate' => ['bool', 'host'=>'string', 'port'=>'int', 'key'=>'string|string[]', 'db'=>'int', 'timeout'=>'int', 'copy='=>'bool', 'replace='=>'bool'],
-'Redis::move' => ['bool', 'key'=>'string', 'dbindex'=>'int'],
-'Redis::mSet' => ['bool', 'pairs'=>'array'],
-'Redis::mSetNx' => ['bool', 'pairs'=>'array'],
-'Redis::multi' => ['Redis', 'mode='=>'int'],
-'Redis::object' => ['string|long|false', 'info'=>'string', 'key'=>'string'],
-'Redis::open' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'reserved='=>'null', 'retry_interval='=>'?int', 'read_timeout='=>'float'],
+'Redis::ltrim' => ['__benevolent<Redis|bool>', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
+'Redis::mget' => ['__benevolent<Redis|array<string, mixed>>', 'keys'=>'string[]'],
+'Redis::migrate' => ['__benevolent<Redis|bool>', 'host'=>'string', 'port'=>'int', 'key'=>'string|string[]', 'dstdb'=>'int', 'timeout'=>'int', 'copy='=>'bool', 'replace='=>'bool', 'credentials='=>'mixed'],
+'Redis::move' => ['__benevolent<Redis|bool>', 'key'=>'string', 'index'=>'int'],
+'Redis::mset' => ['__benevolent<Redis|bool>', 'key_values'=>'array<string, mixed>'],
+'Redis::msetnx' => ['__benevolent<Redis|bool>', 'key_values'=>'array<string, mixed>'],
+'Redis::multi' => ['__benevolent<Redis|bool>', 'value='=>'int'],
+'Redis::object' => ['__benevolent<Redis|int|string|false>', 'subcommand'=>'string', 'key'=>'string'],
+'Redis::open' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'?string', 'retry_interval='=>'int', 'read_timeout='=>'float', 'context='=>'?array{auth?:list{string|null|false,string}|list{string},stream?:array<string,mixed>}'],
 'Redis::pconnect' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'?string', 'retry_interval='=>'int', 'read_timeout='=>'float', 'context='=>'?array{auth?:list{string|null|false,string}|list{string},stream?:array<string,mixed>}'],
-'Redis::persist' => ['bool', 'key'=>'string'],
-'Redis::pExpire' => ['bool', 'key'=>'string', 'ttl'=>'int'],
-'Redis::pexpireAt' => ['bool', 'key'=>'string', 'expiry'=>'int'],
-'Redis::pfAdd' => ['bool', 'key'=>'string', 'elements'=>'array'],
-'Redis::pfCount' => ['int', 'key'=>'array|string'],
-'Redis::pfMerge' => ['bool', 'destkey'=>'string', 'sourcekeys'=>'array'],
-'Redis::ping' => ['string'],
-'Redis::popen' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'string', 'retry_interval='=>'?int'],
-'Redis::psetex' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
-'Redis::psubscribe' => ['', 'patterns'=>'array', 'callback'=>'array|string'],
-'Redis::pttl' => ['int|false', 'key'=>'string'],
-'Redis::publish' => ['int', 'channel'=>'string', 'message'=>'string'],
-'Redis::pubsub' => ['array|int', 'keyword'=>'string', 'argument'=>'array|string'],
-'Redis::punsubscribe' => ['', 'pattern'=>'string', '...other_patterns='=>'string'],
-'Redis::randomKey' => ['string'],
-'Redis::rawCommand' => ['mixed', 'command'=>'string', '...arguments='=>'mixed'],
-'Redis::rename' => ['bool', 'srckey'=>'string', 'dstkey'=>'string'],
+'Redis::persist' => ['__benevolent<Redis|bool>', 'key'=>'string'],
+'Redis::pexpire' => ['bool', 'key'=>'string', 'timeout'=>'int', 'mode='=>'?string'],
+'Redis::pexpireAt' => ['__benevolent<Redis|bool>', 'key'=>'string', 'timestamp'=>'int', 'mode='=>'?string'],
+'Redis::pexpiretime' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::pfadd' => ['__benevolent<Redis|int>', 'key'=>'string', 'elements'=>'array'],
+'Redis::pfcount' => ['__benevolent<Redis|int|false>', 'key_or_keys'=>'string[]|string'],
+'Redis::pfmerge' => ['__benevolent<Redis|bool>', 'dst'=>'string', 'srckeys'=>'string[]'],
+'Redis::ping' => ['__benevolent<Redis|string|bool>', 'message='=>'?string'],
+'Redis::pipeline' => ['__benevolent<Redis|bool>'],
+'Redis::popen' => ['bool', 'host'=>'string', 'port='=>'int', 'timeout='=>'float', 'persistent_id='=>'?string', 'retry_interval='=>'int', 'read_timeout='=>'float', 'context='=>'?array{auth?:list{string|null|false,string}|list{string},stream?:array<string,mixed>}'],
+'Redis::psetex' => ['__benevolent<Redis|bool>', 'key'=>'string', 'expire'=>'int', 'value'=>'mixed'],
+'Redis::psubscribe' => ['bool', 'patterns'=>'string[]', 'cb'=>'callable'],
+'Redis::pttl' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::publish' => ['__benevolent<Redis|int|false>', 'channel'=>'string', 'message'=>'string'],
+'Redis::pubsub' => ['array|int', 'command'=>'string', 'arg'=>'array|string'],
+'Redis::punsubscribe' => ['__benevolent<Redis|array|bool>', 'patterns='=>'string[]'],
+'Redis::randomKey' => ['__benevolent<Redis|string|false>'],
+'Redis::rawcommand' => ['mixed', 'command'=>'string', '...args='=>'mixed'],
+'Redis::rename' => ['__benevolent<Redis|bool>', 'old_name'=>'string', 'new_name'=>'string'],
 'Redis::renameKey' => ['bool', 'srckey'=>'string', 'dstkey'=>'string'],
-'Redis::renameNx' => ['bool', 'srckey'=>'string', 'dstkey'=>'string'],
+'Redis::renameNx' => ['__benevolent<Redis|bool>', 'old_name'=>'string', 'new_name'=>'string'],
+'Redis::reset' => ['__benevolent<Redis|bool>'],
 'Redis::resetStat' => ['bool'],
-'Redis::restore' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
-'Redis::rPop' => ['string', 'key'=>'string'],
-'Redis::rpoplpush' => ['string', 'srcKey'=>'string', 'dstKey'=>'string'],
-'Redis::rPush' => ['int|false', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
-'Redis::rPushx' => ['int|false', 'key'=>'string', 'value'=>'string'],
-'Redis::sAdd' => ['int|false', 'key'=>'string', 'value1'=>'string', 'value2='=>'string', 'valueN='=>'string'],
-'Redis::sAddArray' => ['bool', 'key'=>'string', 'values'=>'array'],
-'Redis::save' => ['bool'],
-'Redis::scan' => ['array<int,string>|false', '&w_iterator'=>'?int', 'pattern='=>'?string', 'count='=>'?int'],
-'Redis::sCard' => ['int', 'key'=>'string'],
+'Redis::restore' => ['__benevolent<Redis|bool>', 'key'=>'string', 'ttl'=>'int', 'value'=>'string', 'options'=>'?array{ABSTTL?:bool,REPLACE?:bool,IDLETIME?:int,FREQ?:int}'],
+'Redis::role' => ['mixed'],
+'Redis::rPop' => ['__benevolent<Redis|array<string, mixed>|string|bool>', 'key'=>'string', 'count='=>'int'],
+'Redis::rpoplpush' => ['__benevolent<Redis|string|false>', 'srckey'=>'string', 'dstkey'=>'string'],
+'Redis::rPush' => ['__benevolent<Redis|int|false>', 'key'=>'string', '...elements='=>'mixed'],
+'Redis::rPushx' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'mixed'],
+'Redis::sAdd' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'mixed', '...other_values='=>'string'],
+'Redis::sAddArray' => ['int', 'key'=>'string', 'values'=>'array'],
+'Redis::save' => ['__benevolent<Redis|bool>'],
+'Redis::scan' => ['array<int,string>|false', '&iterator'=>'?int', 'pattern='=>'?string', 'count='=>'?int', 'type='=>'?string'],
+'Redis::scard' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
 'Redis::sContains' => ['', 'key'=>'string', 'value'=>'string'],
 'Redis::script' => ['mixed', 'command'=>'string', '...args='=>'mixed'],
-'Redis::sDiff' => ['list<string>', 'key1'=>'string', '...other_keys='=>'string'],
-'Redis::sDiffStore' => ['int|false', 'dstKey'=>'string', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::select' => ['bool', 'dbindex'=>'int'],
-'Redis::set' => ['bool', 'key'=>'string', 'value'=>'mixed', 'options='=>'array'],
+'Redis::sDiff' => ['__benevolent<Redis|list<string>|false>', 'key'=>'string', '...other_keys='=>'string'],
+'Redis::sDiffStore' => ['__benevolent<Redis|int|false>', 'dst'=>'string', 'key'=>'string', '...other_keys='=>'string'],
+'Redis::select' => ['__benevolent<Redis|bool>', 'db'=>'int'],
+'Redis::set' => ['__benevolent<Redis|string|bool>', 'key'=>'string', 'value'=>'mixed', 'options='=>'array'],
 'Redis::set\'1' => ['bool', 'key'=>'string', 'value'=>'mixed', 'timeout='=>'int'],
-'Redis::setBit' => ['int', 'key'=>'string', 'offset'=>'int', 'value'=>'int'],
-'Redis::setEx' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
-'Redis::setex' => ['bool', 'key'=>'string', 'ttl'=>'int', 'value'=>'string'],
-'Redis::setNx' => ['bool', 'key'=>'string', 'value'=>'string'],
-'Redis::setnx' => ['bool', 'key'=>'string', 'value'=>'string'],
-'Redis::setOption' => ['bool', 'name'=>'int', 'value'=>'mixed'],
-'Redis::setRange' => ['int', 'key'=>'string', 'offset'=>'int', 'end'=>'string'],
+'Redis::setBit' => ['__benevolent<Redis|int|bool>', 'key'=>'string', 'idx'=>'int', 'value'=>'bool'],
+'Redis::setex' => ['__benevolent<Redis|bool>', 'key'=>'string', 'expire'=>'int', 'value'=>'mixed'],
+'Redis::setnx' => ['__benevolent<Redis|bool>', 'key'=>'string', 'value'=>'mixed'],
+'Redis::setOption' => ['bool', 'option'=>'int', 'value'=>'mixed'],
+'Redis::setRange' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'index'=>'int', 'value'=>'string'],
 'Redis::setTimeout' => ['bool', 'key'=>'string', 'ttl'=>'int'],
 'Redis::sGetMembers' => ['array', 'key'=>'string'],
-'Redis::sInter' => ['list<string>|false', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::sInterStore' => ['int|false', 'dstKey'=>'string', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::sIsMember' => ['bool', 'key'=>'string', 'value'=>'string'],
+'Redis::sInter' => ['__benevolent<Redis|list<string>|false>', 'key'=>'string', '...other_keys='=>'string'],
+'Redis::sintercard' => ['__benevolent<Redis|int|false>', 'keys'=>'string[]', 'limit='=>'int'],
+'Redis::sInterStore' => ['__benevolent<Redis|int|false>', 'key'=>'string[]|string', '...other_keys='=>'string'],
+'Redis::sismember' => ['__benevolent<Redis|bool>', 'key'=>'string', 'value'=>'mixed'],
 'Redis::slave' => ['bool', 'host'=>'string', 'port'=>'int'],
 'Redis::slave\'1' => ['bool', 'host'=>'string', 'port'=>'int'],
-'Redis::slaveof' => ['bool', 'host='=>'string', 'port='=>'int'],
-'Redis::slowLog' => ['mixed', 'operation'=>'string', 'length='=>'int'],
-'Redis::sMembers' => ['list<string>', 'key'=>'string'],
-'Redis::sMove' => ['bool', 'srcKey'=>'string', 'dstKey'=>'string', 'member'=>'string'],
-'Redis::sort' => ['array|int', 'key'=>'string', 'options='=>'array'],
-'Redis::sPop' => ['string|false', 'key'=>'string'],
-'Redis::sRandMember' => ['array|string|false', 'key'=>'string', 'count='=>'int'],
-'Redis::sRem' => ['int', 'key'=>'string', 'member1'=>'string', '...other_members='=>'string'],
+'Redis::slaveof' => ['__benevolent<Redis|bool>', 'host='=>'?string', 'port='=>'int'],
+'Redis::slowlog' => ['mixed', 'operation'=>'string', 'length='=>'int'],
+'Redis::sMembers' => ['__benevolent<Redis|list<string>|false>', 'key'=>'string'],
+'Redis::sMisMember' => ['__benevolent<Redis|int[]|false>', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
+'Redis::sMove' => ['__benevolent<Redis|bool>', 'src'=>'string', 'dst'=>'string', 'value'=>'mixed'],
+'Redis::sort' => ['array|int', 'key'=>'string', 'options='=>'?array{SORT?:string,ALPHA?:bool,LIMIT?:array{0:int,1:int},BY?:string,GET?:string}'],
+'Redis::sort_ro' => ['array|int', 'key'=>'string', 'options='=>'?array{SORT?:string,ALPHA?:bool,LIMIT?:array{0:int,1:int},BY?:string,GET?:string}'],
+'Redis::sPop' => ['__benevolent<Redis|string|array|false>', 'key'=>'string', 'count='=>'int'],
+'Redis::sRandMember' => ['__benevolent<Redis|string|array|false>', 'key'=>'string', 'count='=>'int'],
+'Redis::srem' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'value'=>'mixed', '...other_values='=>'mixed'],
 'Redis::sRemove' => ['int', 'key'=>'string', 'member1'=>'string', '...other_members='=>'string'],
-'Redis::sScan' => ['array|bool', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'string', 'count='=>'int'],
-'Redis::strLen' => ['0|positive-int', 'key'=>'string'],
-'Redis::subscribe' => ['mixed|null', 'channels'=>'array', 'callback'=>'string|array'],
+'Redis::sscan' => ['__benevolent<Redis|string[]|false>', 'key'=>'string', '&iterator'=>'?int', 'pattern='=>'?string', 'count='=>'int'],
+'Redis::ssubscribe' => ['bool', 'channels'=>'string[]', 'cb'=>'callable'],
+'Redis::strlen' => ['__benevolent<Redis|0|positive-int|false>', 'key'=>'string'],
+'Redis::subscribe' => ['bool', 'channels'=>'string[]', 'cb'=>'callable'],
 'Redis::substr' => ['', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
-'Redis::sUnion' => ['list<string>', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::sUnionStore' => ['int', 'dstKey'=>'string', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::time' => ['array'],
-'Redis::ttl' => ['int|false', 'key'=>'string'],
-'Redis::type' => ['int', 'key'=>'string'],
-'Redis::unlink' => ['int', 'key'=>'string', '...args'=>'string'],
 'Redis::unlink\'1' => ['int', 'key'=>'string[]'],
-'Redis::unsubscribe' => ['', 'channel'=>'string', '...other_channels='=>'string'],
-'Redis::unwatch' => [''],
-'Redis::wait' => ['int', 'numSlaves'=>'int', 'timeout'=>'int'],
-'Redis::watch' => ['void', 'key'=>'string', '...other_keys='=>'string'],
-'Redis::xack' => ['', 'str_key'=>'string', 'str_group'=>'string', 'arr_ids'=>'array'],
-'Redis::xadd' => ['', 'str_key'=>'string', 'str_id'=>'string', 'arr_fields'=>'array', 'i_maxlen='=>'', 'boo_approximate='=>''],
-'Redis::xclaim' => ['', 'str_key'=>'string', 'str_group'=>'string', 'str_consumer'=>'string', 'i_min_idle'=>'', 'arr_ids'=>'array', 'arr_opts='=>'array'],
-'Redis::xdel' => ['', 'str_key'=>'string', 'arr_ids'=>'array'],
-'Redis::xgroup' => ['', 'str_operation'=>'string', 'str_key='=>'string', 'str_arg1='=>'', 'str_arg2='=>'', 'str_arg3='=>''],
-'Redis::xinfo' => ['', 'str_cmd'=>'string', 'str_key='=>'string', 'str_group='=>'string'],
-'Redis::xlen' => ['', 'key'=>''],
-'Redis::xpending' => ['', 'str_key'=>'string', 'str_group'=>'string', 'str_start='=>'', 'str_end='=>'', 'i_count='=>'', 'str_consumer='=>'string'],
-'Redis::xrange' => ['', 'str_key'=>'string', 'str_start'=>'', 'str_end'=>'', 'i_count='=>''],
-'Redis::xread' => ['', 'arr_streams'=>'array', 'i_count='=>'', 'i_block='=>''],
-'Redis::xreadgroup' => ['', 'str_group'=>'string', 'str_consumer'=>'string', 'arr_streams'=>'array', 'i_count='=>'', 'i_block='=>''],
-'Redis::xrevrange' => ['', 'str_key'=>'string', 'str_start'=>'', 'str_end'=>'', 'i_count='=>''],
-'Redis::xtrim' => ['', 'str_key'=>'string', 'i_maxlen'=>'', 'boo_approximate='=>''],
-'Redis::zAdd' => ['int', 'key'=>'string', 'score1'=>'float', 'value1'=>'string', 'score2='=>'float', 'value2='=>'string', 'scoreN='=>'float', 'valueN='=>'string'],
+'Redis::sUnion' => ['__benevolent<Redis|list<string>|false>', 'key'=>'string', '...other_keys='=>'string'],
+'Redis::sUnionStore' => ['__benevolent<Redis|int|false>', 'dst'=>'string', 'key'=>'string', '...other_keys='=>'string'],
+'Redis::sunsubscribe' => ['__benevolent<Redis|string[]|false>', 'channels'=>'string[]'],
+'Redis::swapdb' => ['__benevolent<Redis|bool>', 'src'=>'int', 'dst'=>'int'],
+'Redis::time' => ['__benevolent<Redis|array{0:int,1:int}>'],
+'Redis::ttl' => ['__benevolent<Redis|-2|-1|int|false>', 'key'=>'string'],
+'Redis::type' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::unlink' => ['__benevolent<Redis|0|positive-int|false>', 'key'=>'string[]|string', '...other_keys'=>'string'],
+'Redis::unsubscribe' => ['__benevolent<Redis|string[]|bool>', 'channels'=>'string[]'],
+'Redis::unwatch' => ['__benevolent<Redis|bool>'],
+'Redis::wait' => ['int|false', 'numreplicas'=>'int', 'timeout'=>'int'],
+'Redis::watch' => ['__benevolent<Redis|bool>', 'key'=>'string[]|string', '...other_keys='=>'string'],
+'Redis::xack' => ['int|false', 'key'=>'string', 'group'=>'string', 'ids'=>'array'],
+'Redis::xadd' => ['__benevolent<Redis|string|false>', 'key'=>'string', 'id'=>'string', 'values'=>'array', 'maxlen='=>'int', 'approx='=>'bool', 'nomkstream='=>'bool'],
+'Redis::xclaim' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'group'=>'string', 'consumer'=>'string', 'min_idle'=>'int', 'ids'=>'array', 'options='=>'array'],
+'Redis::xdel' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'ids'=>'array'],
+'Redis::xgroup' => ['mixed', 'operation'=>'string', 'key='=>'?string', 'group='=>'?string', 'id_or_consumer='=>'?string', 'mkstream='=>'bool', 'entries_read='=>'int'],
+'Redis::xinfo' => ['mixed', 'operation'=>'string', 'arg1='=>'?string', 'arg2='=>'?string', 'count='=>'int'],
+'Redis::xlen' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::xpending' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'group'=>'string', 'start='=>'?string', 'end='=>'?string', 'count='=>'int', 'consumer='=>'?string'],
+'Redis::xrange' => ['__benevolent<Redis|array|bool>', 'key'=>'string', 'start'=>'string', 'end'=>'string', 'count='=>'int'],
+'Redis::xread' => ['__benevolent<Redis|array|bool>', 'streams'=>'array', 'count='=>'int', 'block='=>'int'],
+'Redis::xreadgroup' => ['__benevolent<Redis|array|bool>', 'group'=>'string', 'consumer'=>'string', 'streams'=>'array', 'count='=>'int', 'block='=>'int'],
+'Redis::xrevrange' => ['__benevolent<Redis|array|bool>', 'key'=>'string', 'end'=>'string', 'start'=>'string', 'count='=>'int'],
+'Redis::xtrim' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'threshold'=>'string', 'approx='=>'bool', 'minid='=>'bool', 'limit='=>'int'],
+'Redis::zAdd' => ['__benevolent<Redis|int|float|false>', 'key'=>'string', 'score_or_options'=>'array|float', '...more_scores_and_mems='=>'mixed'],
 'Redis::zAdd\'1' => ['int', 'key'=>'string', 'options'=>'array', 'score1'=>'float', 'value1'=>'string', 'score2='=>'float', 'value2='=>'string', 'scoreN='=>'float', 'valueN='=>'string'],
-'Redis::zCard' => ['int', 'key'=>'string'],
-'Redis::zCount' => ['int', 'key'=>'string', 'start'=>'string', 'end'=>'string'],
+'Redis::zCard' => ['__benevolent<Redis|int|false>', 'key'=>'string'],
+'Redis::zCount' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'start'=>'string', 'end'=>'string'],
 'Redis::zDelete' => ['int', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
 'Redis::zDeleteRangeByRank' => ['', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
 'Redis::zDeleteRangeByScore' => ['', 'key'=>'string', 'start'=>'float', 'end'=>'float'],
-'Redis::zIncrBy' => ['float', 'key'=>'string', 'value'=>'float', 'member'=>'string'],
-'Redis::zInter' => ['int', 'Output'=>'string', 'ZSetKeys'=>'array', 'Weights='=>'?array', 'aggregateFunction='=>'string'],
-'Redis::zRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscores='=>'bool'],
-'Redis::zRangeByLex' => ['array|false', 'key'=>'string', 'min'=>'int', 'max'=>'int', 'offset='=>'int', 'limit='=>'int'],
-'Redis::zRangeByScore' => ['array', 'key'=>'string', 'start'=>'int|string', 'end'=>'int|string', 'options='=>'array'],
-'Redis::zRank' => ['int', 'key'=>'string', 'member'=>'string'],
-'Redis::zRem' => ['int', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
+'Redis::zIncrBy' => ['__benevolent<Redis|float|false>', 'key'=>'string', 'value'=>'float', 'member'=>'mixed'],
+'Redis::zInter' => ['__benevolent<Redis|array|false>', 'keys'=>'string[]', 'weights='=>'?array', 'options='=>'?array'],
+'Redis::zmpop' => ['__benevolent<Redis|array|null|false>', 'keys'=>'string[]', 'from'=>'string', 'count='=>'int'],
+'Redis::zRange' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'start'=>'string|int', 'end'=>'string|int', 'options='=>'array|bool|null'],
+'Redis::zRangeByLex' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'min'=>'string', 'max'=>'string', 'offset='=>'int', 'limit='=>'int'],
+'Redis::zRangeByScore' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'start'=>'string', 'end'=>'string', 'options='=>'array'],
+'Redis::zRank' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'member'=>'mixed'],
+'Redis::zRem' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
 'Redis::zRemove' => ['int', 'key'=>'string', 'member'=>'string', '...other_members='=>'string'],
-'Redis::zRemRangeByRank' => ['int', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
-'Redis::zRemRangeByScore' => ['int', 'key'=>'string', 'start'=>'float|string', 'end'=>'float|string'],
-'Redis::zRevRange' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'withscore='=>'bool'],
-'Redis::zRevRangeByLex' => ['array', 'key'=>'string', 'min'=>'int', 'max'=>'int', 'offset='=>'int', 'limit='=>'int'],
-'Redis::zRevRangeByScore' => ['array', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'options='=>'array'],
-'Redis::zRevRank' => ['int', 'key'=>'string', 'member'=>'string'],
-'Redis::zScan' => ['array|false', 'key'=>'string', '&iterator'=>'int', 'pattern='=>'string', 'count='=>'int'],
-'Redis::zScore' => ['float|false', 'key'=>'string', 'member'=>'string'],
+'Redis::zRemRangeByRank' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'start'=>'int', 'end'=>'int'],
+'Redis::zRemRangeByScore' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'start'=>'string', 'end'=>'string'],
+'Redis::zRevRange' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'start'=>'int', 'end'=>'int', 'scores='=>'bool|array{withscores:bool}|null'],
+'Redis::zRevRangeByLex' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'max'=>'string', 'min'=>'string', 'offset='=>'int', 'limit='=>'int'],
+'Redis::zRevRangeByScore' => ['__benevolent<Redis|array|false>', 'key'=>'string', 'max'=>'string', 'min'=>'string', 'options='=>'array|bool'],
+'Redis::zRevRank' => ['__benevolent<Redis|int|false>', 'key'=>'string', 'member'=>'mixed'],
+'Redis::zscan' => ['__benevolent<Redis|array|false>', 'key'=>'string', '&iterator'=>'?int', 'pattern='=>'?string', 'count='=>'int'],
+'Redis::zScore' => ['__benevolent<Redis|float|false>', 'key'=>'string', 'member'=>'mixed'],
 'Redis::zSize' => ['', 'key'=>'string'],
-'Redis::zUnion' => ['int', 'Output'=>'string', 'ZSetKeys'=>'array', 'Weights='=>'?array', 'aggregateFunction='=>'string'],
+'Redis::zUnion' => ['__benevolent<Redis|array|false>', 'keys'=>'string[]', 'weights'=>'?array', 'options='=>'?array'],
 'RedisArray::__construct' => ['void', 'name'=>'string'],
 'RedisArray::__construct\'1' => ['void', 'hosts'=>'array<int, string>', 'opts='=>'array<string, string>'],
 'RedisArray::_function' => ['string'],