Merge "Fix sessionfailure i18n message during authentication"

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

diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index a5c4688..2e93f36 100644 (file)
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -1,4 +1,6 @@
 <?php
+
+use Mediawiki\Http\HttpRequestFactory;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
@@ -7,6 +9,11 @@ use MediaWiki\Services\DestructibleService;
 use MediaWiki\Services\SalvageableService;
 use MediaWiki\Services\ServiceDisabledException;
 use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Storage\BlobStore;
+use MediaWiki\Storage\BlobStoreFactory;
+use MediaWiki\Storage\RevisionLookup;
+use MediaWiki\Storage\RevisionStore;
+use MediaWiki\Storage\SqlBlobStore;
 
 /**
  * @covers MediaWiki\MediaWikiServices
@@ -47,14 +54,14 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
        public function testGetInstance() {
                $services = MediaWikiServices::getInstance();
-               $this->assertInstanceOf( 'MediaWiki\\MediaWikiServices', $services );
+               $this->assertInstanceOf( MediaWikiServices::class, $services );
        }
 
        public function testForceGlobalInstance() {
                $newServices = $this->newMediaWikiServices();
                $oldServices = MediaWikiServices::forceGlobalInstance( $newServices );
 
-               $this->assertInstanceOf( 'MediaWiki\\MediaWikiServices', $oldServices );
+               $this->assertInstanceOf( MediaWikiServices::class, $oldServices );
                $this->assertNotSame( $oldServices, $newServices );
 
                $theServices = MediaWikiServices::getInstance();
@@ -143,7 +150,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                $newServices = $this->newMediaWikiServices();
                $oldServices = MediaWikiServices::forceGlobalInstance( $newServices );
 
-               $lbFactory = $this->getMockBuilder( 'LBFactorySimple' )
+               $lbFactory = $this->getMockBuilder( \Wikimedia\Rdbms\LBFactorySimple::class )
                        ->disableOriginalConstructor()
                        ->getMock();
 
@@ -218,7 +225,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'Test',
                        function () use ( &$serviceCounter ) {
                                $serviceCounter++;
-                               $service = $this->createMock( 'MediaWiki\Services\DestructibleService' );
+                               $service = $this->createMock( MediaWiki\Services\DestructibleService::class );
                                $service->expects( $this->once() )->method( 'destroy' );
                                return $service;
                        }
@@ -247,7 +254,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                $services->defineService(
                        'Test',
                        function () {
-                               $service = $this->createMock( 'MediaWiki\Services\DestructibleService' );
+                               $service = $this->createMock( MediaWiki\Services\DestructibleService::class );
                                $service->expects( $this->never() )->method( 'destroy' );
                                return $service;
                        }
@@ -309,7 +316,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'SearchEngineConfig' => [ 'SearchEngineConfig', SearchEngineConfig::class ],
                        'SkinFactory' => [ 'SkinFactory', SkinFactory::class ],
                        'DBLoadBalancerFactory' => [ 'DBLoadBalancerFactory', Wikimedia\Rdbms\LBFactory::class ],
-                       'DBLoadBalancer' => [ 'DBLoadBalancer', 'LoadBalancer' ],
+                       'DBLoadBalancer' => [ 'DBLoadBalancer', Wikimedia\Rdbms\LoadBalancer::class ],
                        'WatchedItemStore' => [ 'WatchedItemStore', WatchedItemStore::class ],
                        'WatchedItemQueryService' => [ 'WatchedItemQueryService', WatchedItemQueryService::class ],
                        'CryptRand' => [ 'CryptRand', CryptRand::class ],
@@ -331,6 +338,13 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'LocalServerObjectCache' => [ 'LocalServerObjectCache', BagOStuff::class ],
                        'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ],
                        'ShellCommandFactory' => [ 'ShellCommandFactory', CommandFactory::class ],
+                       'BlobStoreFactory' => [ 'BlobStoreFactory', BlobStoreFactory::class ],
+                       'BlobStore' => [ 'BlobStore', BlobStore::class ],
+                       '_SqlBlobStore' => [ '_SqlBlobStore', SqlBlobStore::class ],
+                       'RevisionStore' => [ 'RevisionStore', RevisionStore::class ],
+                       'RevisionLookup' => [ 'RevisionLookup', RevisionLookup::class ],
+                       'HttpRequestFactory' => [ 'HttpRequestFactory', HttpRequestFactory::class ],
+                       'CommentStore' => [ 'CommentStore', CommentStore::class ],
                ];
        }