Merge "objectcache: add setMockTime() method to BagOStuff/WANObjectCache"

[lhc/web/wiklou.git] / includes / libs / objectcache / MemcachedClient.php

diff --git a/includes/libs/objectcache/MemcachedClient.php b/includes/libs/objectcache/MemcachedClient.php
index 20e30c5..1cc07b7 100644 (file)
--- a/includes/libs/objectcache/MemcachedClient.php
+++ b/includes/libs/objectcache/MemcachedClient.php
@@ -259,11 +259,11 @@ class MemcachedClient {
         * @return mixed
         */
        public function __construct( $args ) {
-               $this->set_servers( isset( $args['servers'] ) ? $args['servers'] : array() );
-               $this->_debug = isset( $args['debug'] ) ? $args['debug'] : false;
+               $this->set_servers( $args['servers'] ?? array() );
+               $this->_debug = $args['debug'] ?? false;
                $this->stats = array();
-               $this->_compress_threshold = isset( $args['compress_threshold'] ) ? $args['compress_threshold'] : 0;
-               $this->_persistent = isset( $args['persistent'] ) ? $args['persistent'] : false;
+               $this->_compress_threshold = $args['compress_threshold'] ?? 0;
+               $this->_persistent = $args['persistent'] ?? false;
                $this->_compress_enable = true;
                $this->_have_zlib = function_exists( 'gzcompress' );
 
@@ -271,12 +271,12 @@ class MemcachedClient {
                $this->_host_dead = array();
 
                $this->_timeout_seconds = 0;
-               $this->_timeout_microseconds = isset( $args['timeout'] ) ? $args['timeout'] : 500000;
+               $this->_timeout_microseconds = $args['timeout'] ?? 500000;
 
-               $this->_connect_timeout = isset( $args['connect_timeout'] ) ? $args['connect_timeout'] : 0.1;
+               $this->_connect_timeout = $args['connect_timeout'] ?? 0.1;
                $this->_connect_attempts = 2;
 
-               $this->_logger = isset( $args['logger'] ) ? $args['logger'] : new NullLogger();
+               $this->_logger = $args['logger'] ?? new NullLogger();
        }
 
        // }}}
@@ -363,7 +363,7 @@ class MemcachedClient {
        /**
         * Changes the TTL on a key from the server to $time
         *
-        * @param string $key Key
+        * @param string $key
         * @param int $time TTL in seconds
         *
         * @return bool True on success, false on failure
@@ -788,13 +788,13 @@ class MemcachedClient {
                $timeout = $this->_connect_timeout;
                $errno = $errstr = null;
                for ( $i = 0; !$sock && $i < $this->_connect_attempts; $i++ ) {
-                       MediaWiki\suppressWarnings();
+                       Wikimedia\suppressWarnings();
                        if ( $this->_persistent == 1 ) {
                                $sock = pfsockopen( $ip, $port, $errno, $errstr, $timeout );
                        } else {
                                $sock = fsockopen( $ip, $port, $errno, $errstr, $timeout );
                        }
-                       MediaWiki\restoreWarnings();
+                       Wikimedia\restoreWarnings();
                }
                if ( !$sock ) {
                        $this->_error_log( "Error connecting to $host: $errstr" );