Use ParserOutput stateless transforms

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

diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index cc95e38..a5c4688 100644 (file)
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -1,5 +1,4 @@
 <?php
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkRendererFactory;
@@ -7,7 +6,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Services\DestructibleService;
 use MediaWiki\Services\SalvageableService;
 use MediaWiki\Services\ServiceDisabledException;
-use Wikimedia\Rdbms\LBFactory;
+use MediaWiki\Shell\CommandFactory;
 
 /**
  * @covers MediaWiki\MediaWikiServices
@@ -71,13 +70,13 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                $newServices = $this->newMediaWikiServices();
                $oldServices = MediaWikiServices::forceGlobalInstance( $newServices );
 
-               $service1 = $this->getMock( SalvageableService::class );
+               $service1 = $this->createMock( SalvageableService::class );
                $service1->expects( $this->never() )
                        ->method( 'salvage' );
 
                $newServices->defineService(
                        'Test',
-                       function() use ( $service1 ) {
+                       function () use ( $service1 ) {
                                return $service1;
                        }
                );
@@ -104,11 +103,11 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                $newServices = $this->newMediaWikiServices();
                $oldServices = MediaWikiServices::forceGlobalInstance( $newServices );
 
-               $service1 = $this->getMock( SalvageableService::class );
+               $service1 = $this->createMock( SalvageableService::class );
                $service1->expects( $this->never() )
                        ->method( 'salvage' );
 
-               $service2 = $this->getMock( SalvageableService::class );
+               $service2 = $this->createMock( SalvageableService::class );
                $service2->expects( $this->once() )
                        ->method( 'salvage' )
                        ->with( $service1 );
@@ -121,7 +120,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
                $newServices->defineService(
                        'Test',
-                       function() use ( &$instantiatorReturnValues ) {
+                       function () use ( &$instantiatorReturnValues ) {
                                return array_shift( $instantiatorReturnValues );
                        }
                );
@@ -150,7 +149,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
                $newServices->redefineService(
                        'DBLoadBalancerFactory',
-                       function() use ( $lbFactory ) {
+                       function () use ( $lbFactory ) {
                                return $lbFactory;
                        }
                );
@@ -178,11 +177,11 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                $newServices = $this->newMediaWikiServices();
                $oldServices = MediaWikiServices::forceGlobalInstance( $newServices );
 
-               $service1 = $this->getMock( DestructibleService::class );
+               $service1 = $this->createMock( DestructibleService::class );
                $service1->expects( $this->once() )
                        ->method( 'destroy' );
 
-               $service2 = $this->getMock( DestructibleService::class );
+               $service2 = $this->createMock( DestructibleService::class );
                $service2->expects( $this->never() )
                        ->method( 'destroy' );
 
@@ -194,7 +193,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
                $newServices->defineService(
                        'Test',
-                       function() use ( &$instantiatorReturnValues ) {
+                       function () use ( &$instantiatorReturnValues ) {
                                return array_shift( $instantiatorReturnValues );
                        }
                );
@@ -217,9 +216,9 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
                $services->defineService(
                        'Test',
-                       function() use ( &$serviceCounter ) {
+                       function () use ( &$serviceCounter ) {
                                $serviceCounter++;
-                               $service = $this->getMock( 'MediaWiki\Services\DestructibleService' );
+                               $service = $this->createMock( 'MediaWiki\Services\DestructibleService' );
                                $service->expects( $this->once() )->method( 'destroy' );
                                return $service;
                        }
@@ -247,8 +246,8 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 
                $services->defineService(
                        'Test',
-                       function() {
-                               $service = $this->getMock( 'MediaWiki\Services\DestructibleService' );
+                       function () {
+                               $service = $this->createMock( 'MediaWiki\Services\DestructibleService' );
                                $service->expects( $this->never() )->method( 'destroy' );
                                return $service;
                        }
@@ -303,7 +302,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'MainConfig' => [ 'MainConfig', Config::class ],
                        'SiteStore' => [ 'SiteStore', SiteStore::class ],
                        'SiteLookup' => [ 'SiteLookup', SiteLookup::class ],
-                       'StatsdDataFactory' => [ 'StatsdDataFactory', StatsdDataFactory::class ],
+                       'StatsdDataFactory' => [ 'StatsdDataFactory', IBufferingStatsdDataFactory::class ],
                        'InterwikiLookup' => [ 'InterwikiLookup', InterwikiLookup::class ],
                        'EventRelayerGroup' => [ 'EventRelayerGroup', EventRelayerGroup::class ],
                        'SearchEngineFactory' => [ 'SearchEngineFactory', SearchEngineFactory::class ],
@@ -317,6 +316,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'CryptHKDF' => [ 'CryptHKDF', CryptHKDF::class ],
                        'MediaHandlerFactory' => [ 'MediaHandlerFactory', MediaHandlerFactory::class ],
                        'Parser' => [ 'Parser', Parser::class ],
+                       'ParserCache' => [ 'ParserCache', ParserCache::class ],
                        'GenderCache' => [ 'GenderCache', GenderCache::class ],
                        'LinkCache' => [ 'LinkCache', LinkCache::class ],
                        'LinkRenderer' => [ 'LinkRenderer', LinkRenderer::class ],
@@ -329,7 +329,8 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'MainObjectStash' => [ 'MainObjectStash', BagOStuff::class ],
                        'MainWANObjectCache' => [ 'MainWANObjectCache', WANObjectCache::class ],
                        'LocalServerObjectCache' => [ 'LocalServerObjectCache', BagOStuff::class ],
-                       'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ]
+                       'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ],
+                       'ShellCommandFactory' => [ 'ShellCommandFactory', CommandFactory::class ],
                ];
        }