Merge "RCFilters: Override frameless button opacity to show real highlight color"

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

diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php b/tests/phpunit/tests/MediaWikiTestCaseTest.php
index fb2957b..599b733 100644 (file)
--- a/tests/phpunit/tests/MediaWikiTestCaseTest.php
+++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php
@@ -72,6 +72,7 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
         * @covers MediaWikiTestCase::tearDown
         */
        public function testStashedGlobalsAreRestoredOnTearDown( $globalKey, $newValue ) {
+               $this->hideDeprecated( 'MediaWikiTestCase::stashMwGlobals' );
                $this->stashMwGlobals( $globalKey );
                $GLOBALS[$globalKey] = $newValue;
                $this->assertEquals(
@@ -114,9 +115,6 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 
                $this->overrideMwServices();
                $this->assertNotSame( $initialServices, MediaWikiServices::getInstance() );
-
-               $this->tearDown();
-               $this->assertSame( $initialServices, MediaWikiServices::getInstance() );
        }
 
        public function testSetService() {
@@ -126,17 +124,11 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
                        ->disableOriginalConstructor()->getMock();
 
                $this->setService( 'DBLoadBalancer', $mockService );
-               $this->assertNotSame( $initialServices, MediaWikiServices::getInstance() );
                $this->assertNotSame(
                        $initialService,
                        MediaWikiServices::getInstance()->getDBLoadBalancer()
                );
                $this->assertSame( $mockService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
-
-               $this->tearDown();
-               $this->assertSame( $initialServices, MediaWikiServices::getInstance() );
-               $this->assertNotSame( $mockService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
-               $this->assertSame( $initialService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
        }
 
        /**
@@ -165,7 +157,7 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
                $logger2 = LoggerFactory::getInstance( 'foo' );
 
                $this->assertNotSame( $logger1, $logger2 );
-               $this->assertInstanceOf( '\Psr\Log\LoggerInterface', $logger2 );
+               $this->assertInstanceOf( \Psr\Log\LoggerInterface::class, $logger2 );
        }
 
        /**