opensourcemirror
/
phpstorm-stubs
mirror of https://github.com/JetBrains/phpstorm-stubs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge https://github.com/ukko/phpredis-phpdoc/pull/62 to 64 to avoid regressions after https://github.com/JetBrains/phpstorm-stubs/pull/643

This commit is contained in:
Shaverdova Elena 2019-08-08 16:49:53 +02:00
parent 21af6cc5e8
commit fd6517b891
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redis/Redis.php
View File

@ -571,7 +571,7 @@ class Redis
* a Redis::PIPELINE block is simply transmitted faster to the server, but without any guarantee of atomicity.
* discard cancels a transaction.
*
* @return resource Redis returns the Redis instance and enters multi-mode.
* @return Redis returns the Redis instance and enters multi-mode.
* Once in multi-mode, all subsequent method calls return the same object until exec() is called.
*
* @link https://redis.io/commands/multi
@ -3388,10 +3388,10 @@ class Redis
* @see zUnionStore
* @deprecated use Redis::zUnionStore()
*
* @param $Output
* @param $ZSetKeys
* @param string $Output
* @param array $ZSetKeys
* @param array|null $Weights
* @param string $aggregateFunction
* @param string $aggregateFunction
*/
public function zUnion($Output, $ZSetKeys, array $Weights = null, $aggregateFunction = 'SUM')
{
@ -4548,7 +4548,7 @@ class Redis
* @example
* <pre>
* $iterator = null;
* while($keys = $redis->scan($iterator)) {
* while(false !== ($keys = $redis->scan($iterator))) {
* foreach($keys as $key) {
* echo $key . PHP_EOL;
* }