Update formatting

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiPHPUnitCommand.php

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 473e641..c139f0b 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -2,17 +2,19 @@
 
 class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
 
-       static $additionalOptions = array(
+       public static $additionalOptions = array(
                'regex=' => false,
                'file=' => false,
                'use-filebackend=' => false,
+               'use-bagostuff=' => false,
                'keep-uploads' => false,
                'use-normal-tables' => false,
                'reuse-db' => false,
+               'wiki=' => false,
        );
 
        public function __construct() {
-               foreach( self::$additionalOptions as $option => $default ) {
+               foreach ( self::$additionalOptions as $option => $default ) {
                        $this->longOptions[$option] = $option . 'Handler';
                }
 
@@ -21,7 +23,7 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
        public static function main( $exit = true ) {
                $command = new self;
 
-               if( wfIsWindows() ) {
+               if ( wfIsWindows() ) {
                        # 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.
@@ -38,24 +40,30 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                # See bug 32022
                set_include_path(
                        __DIR__
-                       .PATH_SEPARATOR
-                       . get_include_path()
+                               . PATH_SEPARATOR
+                               . get_include_path()
                );
 
-               $command->run($_SERVER['argv'], $exit);
+               $command->run( $_SERVER['argv'], $exit );
        }
 
        public function __call( $func, $args ) {
 
-               if( substr( $func, -7 ) == 'Handler' ) {
-                       if( is_null( $args[0] ) ) $args[0] = true; //Booleans
-                       self::$additionalOptions[substr( $func, 0, -7 ) ] = $args[0];
+               if ( substr( $func, -7 ) == 'Handler' ) {
+                       if ( is_null( $args[0] ) ) {
+                               $args[0] = true;
+                       } //Booleans
+                       self::$additionalOptions[substr( $func, 0, -7 )] = $args[0];
                }
        }
 
        public function run( array $argv, $exit = true ) {
+               wfProfileIn( __METHOD__ );
+
                $ret = parent::run( $argv, false );
 
+               wfProfileOut( __METHOD__ );
+
                // Return to real wiki db, so profiling data is preserved
                MediaWikiTestCase::teardownTestDB();