Merge ukko/phpredis-phpdoc#62 to 64 to avoid regressions after #643

redis/Redis.php

@@ -571,7 +571,7 @@ public function unlink($key1, $key2 = null, $key3 = null)
      * 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 @@ public function zUnionStore($output, $zSetKeys, array $weights = null, $aggregat
      * @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 @@ public function time()
      * @example
      * <pre>
      * $iterator = null;
-     * while($keys = $redis->scan($iterator)) {
+     * while(false !== ($keys = $redis->scan($iterator))) {
      *     foreach($keys as $key) {
      *         echo $key . PHP_EOL;
      *     }