Merge remote-tracking branch 'upstream/master' into update

Conflicts:
	src/Redis.php

Author: SHyx0rmZ

src/Redis.php

@@ -270,7 +270,7 @@ public function delete( $key1, $key2 = null, $key3 = null ) {}
     /**
      * Enter and exit transactional mode.
      *
-     * @internal param Redis::MULTI|Redis::PIPELINE
+     * @param int Redis::MULTI|Redis::PIPELINE
      * Defaults to Redis::MULTI.
      * A Redis::MULTI block of commands runs as a single transaction;
      * a Redis::PIPELINE block is simply transmitted faster to the server, but without any guarantee of atomicity.
@@ -294,7 +294,7 @@ public function delete( $key1, $key2 = null, $key3 = null ) {}
      * //    3 => 'val2');
      * </pre>
      */
-    public function multi( ) {}
+    public function multi( $mode = Redis::MULTI ) {}
 
     /**
      * @see multi()
@@ -760,7 +760,6 @@ public function lLen( $key ) {}
     /**
      * @see     lLen()
      * @param   string    $key
-     * @param   int       $index
      * @link    http://redis.io/commands/llen
      */
     public function lSize( $key ) {}
@@ -1511,7 +1510,7 @@ public function expire( $key, $ttl ) {}
      * Sets an expiration date (a timeout in milliseconds) on an item.
      *
      * @param   string  $key    The key that will disappear.
-     * @param   int     $pttl   The key's remaining Time To Live, in milliseconds.
+     * @param   int     $ttl   The key's remaining Time To Live, in milliseconds.
      * @return  bool:   TRUE in case of success, FALSE in case of failure.
      * @link    http://redis.io/commands/pexpire
      * @example
@@ -1885,6 +1884,7 @@ public function bitCount( $key ) {}
      * @param   string  $retKey     return key
      * @param   string  $key1
      * @param   string  $key2
+     * @param   string  $key3
      * @return  int     The size of the string stored in the destination key.
      * @link    http://redis.io/commands/bitop
      * @example
@@ -3255,7 +3255,7 @@ public function _hosts() {}
     public function _function() {}
 
     /**
-     * @param   string  key     The key for which you want to lookup the host
+     * @param   string  $key The key for which you want to lookup the host
      * @return  string  the host to be used for a certain key
      */
     public function _target($key) {}