X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fmctest.php;h=c976bd7048258652d394cb9991045f65244ed8c6;hb=44ef9dd254ef345f77a9a023fd51b44c212b0870;hp=a97d2e1296c81f2feb4245ff50c3f9d85a9546ad;hpb=e4fc0b772130dd520f98b1db9e9313215569239e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index a97d2e1296..c976bd7048 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -33,8 +33,8 @@ require_once __DIR__ . '/Maintenance.php';
 class McTest extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Makes several 'set', 'incr' and 'get' requests on every"
-			. " memcached server and shows a report";
+		$this->addDescription( "Makes several 'set', 'incr' and 'get' requests on every"
+			. " memcached server and shows a report" );
 		$this->addOption( 'i', 'Number of iterations', false, true );
 		$this->addOption( 'cache', 'Use servers from this $wgObjectCaches store', false, true );
 		$this->addArg( 'server[:port]', 'Memcached server to test, with optional port', false );
@@ -47,18 +47,18 @@ class McTest extends Maintenance {
 		$iterations = $this->getOption( 'i', 100 );
 		if ( $cache ) {
 			if ( !isset( $wgObjectCaches[$cache] ) ) {
-				$this->error( "MediaWiki isn't configured with a cache named '$cache'", 1 );
+				$this->fatalError( "MediaWiki isn't configured with a cache named '$cache'" );
 			}
 			$servers = $wgObjectCaches[$cache]['servers'];
 		} elseif ( $this->hasArg() ) {
-			$servers = array( $this->getArg() );
+			$servers = [ $this->getArg() ];
 		} elseif ( $wgMainCacheType === CACHE_MEMCACHED ) {
 			global $wgMemCachedServers;
 			$servers = $wgMemCachedServers;
 		} elseif ( isset( $wgObjectCaches[$wgMainCacheType]['servers'] ) ) {
 			$servers = $wgObjectCaches[$wgMainCacheType]['servers'];
 		} else {
-			$this->error( "MediaWiki isn't configured for Memcached usage", 1 );
+			$this->fatalError( "MediaWiki isn't configured for Memcached usage" );
 		}
 
 		# find out the longest server string to nicely align output later on
@@ -70,11 +70,11 @@ class McTest extends Maintenance {
 				$server # output channel
 			);
 
-			$mcc = new MemCachedClientforWiki( array(
+			$mcc = new MemcachedClient( [
 				'persistant' => true,
 				'timeout' => $wgMemCachedTimeout
-			) );
-			$mcc->set_servers( array( $server ) );
+			] );
+			$mcc->set_servers( [ $server ] );
 			$set = 0;
 			$incr = 0;
 			$get = 0;
@@ -102,5 +102,5 @@ class McTest extends Maintenance {
 	}
 }
 
-$maintClass = "McTest";
+$maintClass = McTest::class;
 require_once RUN_MAINTENANCE_IF_MAIN;