Merge "Selenium: pass -no-sandbox to Chrome under Docker"

[lhc/web/wiklou.git] / tests / phpunit / includes / debug / MWDebugTest.php

diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php
index 9c2bc75..6f0b1db 100644 (file)
--- a/tests/phpunit/includes/debug/MWDebugTest.php
+++ b/tests/phpunit/includes/debug/MWDebugTest.php
@@ -4,20 +4,20 @@ class MWDebugTest extends MediaWikiTestCase {
 
        protected function setUp() {
                parent::setUp();
-               // Make sure MWDebug class is enabled
-               static $MWDebugEnabled = false;
-               if ( !$MWDebugEnabled ) {
-                       MWDebug::init();
-                       $MWDebugEnabled = true;
-               }
                /** Clear log before each test */
                MWDebug::clearLog();
-               MediaWiki\suppressWarnings();
        }
 
-       protected function tearDown() {
-               MediaWiki\restoreWarnings();
-               parent::tearDown();
+       public static function setUpBeforeClass() {
+               parent::setUpBeforeClass();
+               MWDebug::init();
+               Wikimedia\suppressWarnings();
+       }
+
+       public static function tearDownAfterClass() {
+               parent::tearDownAfterClass();
+               MWDebug::deinit();
+               Wikimedia\restoreWarnings();
        }
 
        /**
@@ -99,7 +99,7 @@ class MWDebugTest extends MediaWikiTestCase {
 
                MWDebug::appendDebugInfoToApiResult( $context, $result );
 
-               $this->assertInstanceOf( 'ApiResult', $result );
+               $this->assertInstanceOf( ApiResult::class, $result );
                $data = $result->getResultData();
 
                $expectedKeys = [ 'mwVersion', 'phpEngine', 'phpVersion', 'gitRevision', 'gitBranch',
@@ -110,7 +110,7 @@ class MWDebugTest extends MediaWikiTestCase {
                        $this->assertArrayHasKey( $expectedKey, $data['debuginfo'], "debuginfo has $expectedKey" );
                }
 
-               $xml = ApiFormatXml::recXmlPrint( 'help', $data );
+               $xml = ApiFormatXml::recXmlPrint( 'help', $data, null );
 
                // exception not thrown
                $this->assertInternalType( 'string', $xml );
@@ -123,7 +123,7 @@ class MWDebugTest extends MediaWikiTestCase {
         * @return FauxRequest
         */
        private function newApiRequest( array $params, $requestUrl ) {
-               $request = $this->getMockBuilder( 'FauxRequest' )
+               $request = $this->getMockBuilder( FauxRequest::class )
                        ->setMethods( [ 'getRequestURL' ] )
                        ->setConstructorArgs( [
                                $params