X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fphpunit.php;h=86fc295ded4fabfac34c133ac9ce0bfd6cb19be3;hb=0e19c0483884854a7bb9c41f68249312e8413823;hp=673bb2d7a963cca45e90668da854a66579559ed6;hpb=82c6f0ff036a7c13fa86b30e92a597b79f87cee5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 673bb2d7a9..86fc295ded 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -15,7 +15,7 @@ require_once dirname( dirname( __DIR__ ) ) . "/maintenance/Maintenance.php";
 
 class PHPUnitMaintClass extends Maintenance {
 
-	public static $additionalOptions = array(
+	public static $additionalOptions = [
 		'regex' => false,
 		'file' => false,
 		'use-filebackend' => false,
@@ -25,7 +25,7 @@ class PHPUnitMaintClass extends Maintenance {
 		'use-normal-tables' => false,
 		'reuse-db' => false,
 		'wiki' => false,
-	);
+	];
 
 	public function __construct() {
 		parent::__construct();
@@ -99,9 +99,9 @@ class PHPUnitMaintClass extends Maintenance {
 		// Uses db-replicated in DefaultSettings
 		$wgMainStash = 'hash';
 		// Use memory job queue
-		$wgJobTypeConf = array(
-			'default' => array( 'class' => 'JobQueueMemory', 'order' => 'fifo' ),
-		);
+		$wgJobTypeConf = [
+			'default' => [ 'class' => 'JobQueueMemory', 'order' => 'fifo' ],
+		];
 
 		$wgUseDatabaseMessages = false; # Set for future resets
 
@@ -113,15 +113,15 @@ class PHPUnitMaintClass extends Maintenance {
 		// Generic MediaWiki\Session\SessionManager configuration for tests
 		// We use CookieSessionProvider because things might be expecting
 		// cookies to show up in a FauxRequest somewhere.
-		$wgSessionProviders = array(
-			array(
+		$wgSessionProviders = [
+			[
 				'class' => 'MediaWiki\\Session\\CookieSessionProvider',
-				'args' => array( array(
+				'args' => [ [
 					'priority' => 30,
 					'callUserSetCookiesHook' => true,
-				) ),
-			),
-		);
+				] ],
+			],
+		];
 
 		// Bug 44192 Do not attempt to send a real e-mail
 		Hooks::clear( 'AlternateUserMailer' );
@@ -155,7 +155,7 @@ class PHPUnitMaintClass extends Maintenance {
 		if ( !in_array( '--configuration', $_SERVER['argv'] ) ) {
 			// Hack to eliminate the need to use the Makefile (which sucks ATM)
 			array_splice( $_SERVER['argv'], 1, 0,
-				array( '--configuration', $IP . '/tests/phpunit/suite.xml' ) );
+				[ '--configuration', $IP . '/tests/phpunit/suite.xml' ] );
 		}
 
 		# --with-phpunitdir let us override the default PHPUnit version
@@ -176,19 +176,6 @@ class PHPUnitMaintClass extends Maintenance {
 			$_SERVER['argv'] = array_values( $_SERVER['argv'] );
 		}
 
-		if ( !wfIsWindows() ) {
-			# If we are not running on windows then we can enable phpunit colors
-			# Windows does not come anymore with ANSI.SYS loaded by default
-			# PHPUnit uses the suite.xml parameters to enable/disable colors
-			# which can be then forced to be enabled with --colors.
-			# The below code injects a parameter just like if the user called
-			# Probably fix bug 29226
-			$key = array_search( '--colors', $_SERVER['argv'] );
-			if ( $key === false ) {
-				array_splice( $_SERVER['argv'], 1, 0, '--colors' );
-			}
-		}
-
 		# Makes MediaWiki PHPUnit directory includable so the PHPUnit will
 		# be able to resolve relative files inclusion such as suites/*
 		# PHPUnit uses stream_resolve_include_path() internally
@@ -234,7 +221,7 @@ class PHPUnitMaintClass extends Maintenance {
 	 *  - Split args such as "wiki=enwiki" into two separate arg elements "wiki" and "enwiki"
 	 */
 	private function forceFormatServerArgv() {
-		$argv = array();
+		$argv = [];
 		foreach ( $_SERVER['argv'] as $key => $arg ) {
 			if ( $key === 0 ) {
 				$argv[0] = $arg;
@@ -254,26 +241,18 @@ class PHPUnitMaintClass extends Maintenance {
 $maintClass = 'PHPUnitMaintClass';
 require RUN_MAINTENANCE_IF_MAIN;
 
-// Prevent segfault when we have lots of unit tests (bug 62623)
-if ( version_compare( PHP_VERSION, '5.4.0', '<' ) ) {
-	register_shutdown_function( function () {
-		gc_collect_cycles();
-		gc_disable();
-	} );
-}
-
 $ok = false;
 
 if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {
 	echo "PHPUnit already present\n";
 	$ok = true;
 } else {
-	foreach ( array(
+	foreach ( [
 				stream_resolve_include_path( 'phpunit.phar' ),
 				stream_resolve_include_path( 'phpunit-old.phar' ),
 				'PHPUnit/Runner/Version.php',
 				'PHPUnit/Autoload.php'
-			) as $includePath ) {
+			] as $includePath ) {
 
 		if ( $includePath === false ) {
 			// stream_resolve_include_path can return false