Merge remote-tracking branch 'github/pr/446' into v1.1

src/ClientInterface.php

@@ -81,8 +81,8 @@ use Predis\Profile\ProfileInterface;
  * @method int    hsetnx($key, $field, $value)
  * @method array  hvals($key)
  * @method int    hstrlen($key, $field)
- * @method array  blpop(array $keys, $timeout)
- * @method array  brpop(array $keys, $timeout)
+ * @method array  blpop(array|string $keys, $timeout)
+ * @method array  brpop(array|string $keys, $timeout)
  * @method array  brpoplpush($source, $destination, $timeout)
  * @method string lindex($key, $index)
  * @method int    linsert($key, $whence, $pivot, $value)
@@ -100,10 +100,10 @@ use Predis\Profile\ProfileInterface;
  * @method int    rpushx($key, $value)
  * @method int    sadd($key, array $members)
  * @method int    scard($key)
- * @method array  sdiff(array $keys)
- * @method int    sdiffstore($destination, array $keys)
- * @method array  sinter(array $keys)
- * @method int    sinterstore($destination, array $keys)
+ * @method array  sdiff(array|string $keys)
+ * @method int    sdiffstore($destination, array|string $keys)
+ * @method array  sinter(array|string $keys)
+ * @method int    sinterstore($destination, array|string $keys)
  * @method int    sismember($key, $member)
  * @method array  smembers($key)
  * @method int    smove($source, $destination, $member)
@@ -111,13 +111,13 @@ use Predis\Profile\ProfileInterface;
  * @method string srandmember($key, $count = null)
  * @method int    srem($key, $member)
  * @method array  sscan($key, $cursor, array $options = null)
- * @method array  sunion(array $keys)
- * @method int    sunionstore($destination, array $keys)
+ * @method array  sunion(array|string $keys)
+ * @method int    sunionstore($destination, array|string $keys)
  * @method int    zadd($key, array $membersAndScoresDictionary)
  * @method int    zcard($key)
  * @method string zcount($key, $min, $max)
  * @method string zincrby($key, $increment, $member)
- * @method int    zinterstore($destination, array $keys, array $options = null)
+ * @method int    zinterstore($destination, array|string $keys, array $options = null)
  * @method array  zrange($key, $start, $stop, array $options = null)
  * @method array  zrangebyscore($key, $min, $max, array $options = null)
  * @method int    zrank($key, $member)
@@ -127,7 +127,7 @@ use Predis\Profile\ProfileInterface;
  * @method array  zrevrange($key, $start, $stop, array $options = null)
  * @method array  zrevrangebyscore($key, $max, $min, array $options = null)
  * @method int    zrevrank($key, $member)
- * @method int    zunionstore($destination, array $keys, array $options = null)
+ * @method int    zunionstore($destination, array|string $keys, array $options = null)
  * @method string zscore($key, $member)
  * @method array  zscan($key, $cursor, array $options = null)
  * @method array  zrangebylex($key, $start, $stop, array $options = null)
@@ -136,7 +136,7 @@ use Predis\Profile\ProfileInterface;
  * @method int    zlexcount($key, $min, $max)
  * @method int    pfadd($key, array $elements)
  * @method mixed  pfmerge($destinationKey, array $sourceKeys)
- * @method int    pfcount(array $keys)
+ * @method int    pfcount(array|string $keys)
  * @method mixed  pubsub($subcommand, $argument)
  * @method int    publish($channel, $message)
  * @method mixed  discard()