X-Git-Url: https://git.heureux-cyclage.org/index.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fmaintenance%2FMaintenanceTest.php;h=cb3d227203933c45f9ca952222fd62f7888155fb;hb=5b1dcdc344f5d251120a161637bcb89e01b0f6a4;hp=245a97af1757d9c2796a4dc7841cad0cf6b978f9;hpb=d676a1ca6ec1163f391f9a1305cddd503b7c5a22;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php
index 245a97af17..cb3d227203 100644
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -5,6 +5,7 @@
 // without changing the visibility and without working around hacks in
 // Maintenance.php
 // For the same reason, we cannot just use FakeMaintenance.
+use MediaWiki\MediaWikiServices;
 
 /**
  * makes parts of the API of Maintenance that is hidden by protected visibily
@@ -23,7 +24,6 @@
  * Due to a hack in Maintenance.php using register_shutdown_function, be sure to
  * finally call simulateShutdown on MaintenanceFixup instance before a test
  * ends.
- *
  */
 class MaintenanceFixup extends Maintenance {
 
@@ -80,7 +80,7 @@ class MaintenanceFixup extends Maintenance {
 			return;
 		}
 
-		call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
+		call_user_func_array( [ "parent", __FUNCTION__ ], func_get_args() );
 	}
 
 	/**
@@ -117,17 +117,17 @@ class MaintenanceFixup extends Maintenance {
 		// Maintenance::output signature. However, we do not use (or rely on)
 		// those variables. Instead we pass to Maintenance::output whatever we
 		// receive at runtime.
-		return call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
+		return call_user_func_array( [ "parent", __FUNCTION__ ], func_get_args() );
 	}
 
 	public function addOption( $name, $description, $required = false,
 		$withArg = false, $shortName = false, $multiOccurance = false
 	) {
-		return call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
+		return call_user_func_array( [ "parent", __FUNCTION__ ], func_get_args() );
 	}
 
 	public function getOption( $name, $default = null ) {
-		return call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
+		return call_user_func_array( [ "parent", __FUNCTION__ ], func_get_args() );
 	}
 
 	// --- Requirements for getting instance of abstract class
@@ -826,7 +826,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 	public function testGetConfig() {
 		$this->assertInstanceOf( 'Config', $this->m->getConfig() );
 		$this->assertSame(
-			ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
+			MediaWikiServices::getInstance()->getMainConfig(),
 			$this->m->getConfig()
 		);
 	}
@@ -844,10 +844,10 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2 = new MaintenanceFixup( $this );
 		// Create an option with an argument allowed to be specified multiple times
 		$m2->addOption( 'multi', 'This option does stuff', false, true, false, true );
-		$m2->loadWithArgv( array( '--multi', 'this1', '--multi', 'this2' ) );
+		$m2->loadWithArgv( [ '--multi', 'this1', '--multi', 'this2' ] );
 
-		$this->assertEquals( array( 'this1', 'this2' ), $m2->getOption( 'multi' ) );
-		$this->assertEquals( array( array( 'multi', 'this1' ), array( 'multi', 'this2' ) ),
+		$this->assertEquals( [ 'this1', 'this2' ], $m2->getOption( 'multi' ) );
+		$this->assertEquals( [ [ 'multi', 'this1' ], [ 'multi', 'this2' ] ],
 			$m2->orderedOptions );
 
 		$m2->simulateShutdown();
@@ -855,20 +855,20 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2 = new MaintenanceFixup( $this );
 
 		$m2->addOption( 'multi', 'This option does stuff', false, false, false, true );
-		$m2->loadWithArgv( array( '--multi', '--multi' ) );
+		$m2->loadWithArgv( [ '--multi', '--multi' ] );
 
-		$this->assertEquals( array( 1, 1 ), $m2->getOption( 'multi' ) );
-		$this->assertEquals( array( array( 'multi', 1 ), array( 'multi', 1 ) ), $m2->orderedOptions );
+		$this->assertEquals( [ 1, 1 ], $m2->getOption( 'multi' ) );
+		$this->assertEquals( [ [ 'multi', 1 ], [ 'multi', 1 ] ], $m2->orderedOptions );
 
 		$m2->simulateShutdown();
 
 		$m2 = new MaintenanceFixup( $this );
 		// Create an option with an argument allowed to be specified multiple times
 		$m2->addOption( 'multi', 'This option doesn\'t actually support multiple occurrences' );
-		$m2->loadWithArgv( array( '--multi=yo' ) );
+		$m2->loadWithArgv( [ '--multi=yo' ] );
 
 		$this->assertEquals( 'yo', $m2->getOption( 'multi' ) );
-		$this->assertEquals( array( array( 'multi', 'yo' ) ), $m2->orderedOptions );
+		$this->assertEquals( [ [ 'multi', 'yo' ] ], $m2->orderedOptions );
 
 		$m2->simulateShutdown();
 	}