Merge "rdbms: add IDatabase::lockForUpdate() convenience method"

[lhc/web/wiklou.git] / includes / libs / redis / RedisConnRef.php

diff --git a/includes/libs/redis/RedisConnRef.php b/includes/libs/redis/RedisConnRef.php
index ede35fa..a73fac1 100644 (file)
--- a/includes/libs/redis/RedisConnRef.php
+++ b/includes/libs/redis/RedisConnRef.php
@@ -133,10 +133,10 @@ class RedisConnRef implements LoggerAwareInterface {
        private function tryCall( $method, $arguments ) {
                $this->conn->clearLastError();
                try {
-                       $res = call_user_func_array( [ $this->conn, $method ], $arguments );
+                       $res = $this->conn->$method( ...$arguments );
                        $authError = $this->checkAuthentication();
                        if ( $authError === self::AUTH_ERROR_TEMPORARY ) {
-                               $res = call_user_func_array( [ $this->conn, $method ], $arguments );
+                               $res = $this->conn->$method( ...$arguments );
                        }
                        if ( $authError === self::AUTH_ERROR_PERMANENT ) {
                                throw new RedisException( "Failure reauthenticating to Redis." );
@@ -154,8 +154,8 @@ class RedisConnRef implements LoggerAwareInterface {
         * See: https://github.com/phpredis/phpredis#scan
         *
         * @param int &$iterator
-        * @param string $pattern
-        * @param int $count
+        * @param string|null $pattern
+        * @param int|null $count
         * @return array $res
         */
        public function scan( &$iterator, $pattern = null, $count = null ) {
@@ -169,8 +169,8 @@ class RedisConnRef implements LoggerAwareInterface {
         *
         * @param string $key
         * @param int &$iterator
-        * @param string $pattern
-        * @param int $count
+        * @param string|null $pattern
+        * @param int|null $count
         * @return array $res
         */
        public function sScan( $key, &$iterator, $pattern = null, $count = null ) {
@@ -184,8 +184,8 @@ class RedisConnRef implements LoggerAwareInterface {
         *
         * @param string $key
         * @param int &$iterator
-        * @param string $pattern
-        * @param int $count
+        * @param string|null $pattern
+        * @param int|null $count
         * @return array $res
         */
        public function hScan( $key, &$iterator, $pattern = null, $count = null ) {
@@ -199,8 +199,8 @@ class RedisConnRef implements LoggerAwareInterface {
         *
         * @param string $key
         * @param int &$iterator
-        * @param string $pattern
-        * @param int $count
+        * @param string|null $pattern
+        * @param int|null $count
         * @return array $res
         */
        public function zScan( $key, &$iterator, $pattern = null, $count = null ) {