Replace the global $additionalMWCLIArgs with a class variable.

Provide a default value for verbose since it is checked regardless of existance.

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index b46c880..c7285f4 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -1,6 +1,7 @@
 <?php
 
 class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
+       static $additionalArgs = array( 'verbose' => false );
 
        public function __construct() {
                $this->longOptions['verbose'] = 'verboseHandler';
@@ -12,8 +13,7 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
     }
 
        protected function verboseHandler($value) {
-               global $additionalMWCLIArgs;
-               $additionalMWCLIArgs['verbose'] = true;
+               self::$additionalArgs['verbose'] = true;
        }
 
 }

diff --git a/tests/phpunit/includes/parser/ParserHelpers.php b/tests/phpunit/includes/parser/ParserHelpers.php
index 5b49480..21c8c5b 100644 (file)
--- a/tests/phpunit/includes/parser/ParserHelpers.php
+++ b/tests/phpunit/includes/parser/ParserHelpers.php
@@ -2,22 +2,20 @@
 
 class PHPUnitParserTest extends ParserTest {
        function showTesting( $desc ) {
-               global $additionalMWCLIArgs;
-               if( $additionalMWCLIArgs['verbose'] ) parent::showTesting( $desc );
+               if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showTesting( $desc );
                /* Do nothing since we don't want to show info during PHPUnit testing. */
        }
 
        public function showSuccess( $desc ) {
                global $additionalMWCLIArgs;
                PHPUnit_Framework_Assert::assertTrue( true, $desc );
-               if( $additionalMWCLIArgs['verbose'] ) parent::showSuccess( $desc );
+               if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showSuccess( $desc );
                return true;
        }
 
        public function showFailure( $desc, $expected, $got ) {
-               global $additionalMWCLIArgs;
                PHPUnit_Framework_Assert::assertEquals( $expected, $got, $desc );
-               if( $additionalMWCLIArgs['verbose'] ) parent::showFailure( $desc, $expected, $got );
+               if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showFailure( $desc, $expected, $got );
                return false;
        }