Merge "createNoOpMock() method for PHPUnit tests"

[lhc/web/wiklou.git] / tests / phpunit / includes / objectcache / ObjectCacheTest.php

diff --git a/tests/phpunit/includes/objectcache/ObjectCacheTest.php b/tests/phpunit/includes/objectcache/ObjectCacheTest.php
index f8ce24e..7f52ca6 100644 (file)
--- a/tests/phpunit/includes/objectcache/ObjectCacheTest.php
+++ b/tests/phpunit/includes/objectcache/ObjectCacheTest.php
@@ -16,13 +16,13 @@ class ObjectCacheTest extends MediaWikiTestCase {
 
        private function setCacheConfig( $arr = [] ) {
                $defaults = [
-                       CACHE_NONE => [ 'class' => 'EmptyBagOStuff' ],
-                       CACHE_DB => [ 'class' => 'SqlBagOStuff' ],
+                       CACHE_NONE => [ 'class' => EmptyBagOStuff::class ],
+                       CACHE_DB => [ 'class' => SqlBagOStuff::class ],
                        CACHE_ANYTHING => [ 'factory' => 'ObjectCache::newAnything' ],
                        // Mock ACCEL with 'hash' as being installed.
                        // This makes tests deterministic regardless of APC.
-                       CACHE_ACCEL => [ 'class' => 'HashBagOStuff' ],
-                       'hash' => [ 'class' => 'HashBagOStuff' ],
+                       CACHE_ACCEL => [ 'class' => HashBagOStuff::class ],
+                       'hash' => [ 'class' => HashBagOStuff::class ],
                ];
                $this->setMwGlobals( 'wgObjectCaches', $arr + $defaults );
        }
@@ -70,7 +70,7 @@ class ObjectCacheTest extends MediaWikiTestCase {
 
                $this->setCacheConfig( [
                        // Mock APC not being installed (T160519, T147161)
-                       CACHE_ACCEL => [ 'class' => 'EmptyBagOStuff' ]
+                       CACHE_ACCEL => [ 'class' => EmptyBagOStuff::class ]
                ] );
 
                $this->assertInstanceOf(
@@ -82,18 +82,17 @@ class ObjectCacheTest extends MediaWikiTestCase {
 
        /** @covers ObjectCache::newAnything */
        public function testNewAnythingNoAccelNoDb() {
-               $this->overrideMwServices(); // Ensures restore on tear down
-               MediaWiki\MediaWikiServices::disableStorageBackend();
-
                $this->setMwGlobals( [
                        'wgMainCacheType' => CACHE_ACCEL
                ] );
 
                $this->setCacheConfig( [
                        // Mock APC not being installed (T160519, T147161)
-                       CACHE_ACCEL => [ 'class' => 'EmptyBagOStuff' ]
+                       CACHE_ACCEL => [ 'class' => EmptyBagOStuff::class ]
                ] );
 
+               MediaWiki\MediaWikiServices::disableStorageBackend();
+
                $this->assertInstanceOf(
                        EmptyBagOStuff::class,
                        ObjectCache::newAnything( [] ),
@@ -103,7 +102,6 @@ class ObjectCacheTest extends MediaWikiTestCase {
 
        /** @covers ObjectCache::newAnything */
        public function testNewAnythingNothingNoDb() {
-               $this->overrideMwServices();
                MediaWiki\MediaWikiServices::disableStorageBackend();
 
                $this->assertInstanceOf(