X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMediaWikiServicesTest.php;h=b4e9626904a5d7bcee740103b6e300e5e510fcc0;hb=203cedd029e42bd3c55e50a9cff6f14373d8aa67;hp=cc95e383dd1f335dcb41d22b24e0db14269674c5;hpb=49748181dd56ec97e7ba7c13e684a16abceb3cc0;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php index cc95e383dd..b4e9626904 100644 --- a/tests/phpunit/includes/MediaWikiServicesTest.php +++ b/tests/phpunit/includes/MediaWikiServicesTest.php @@ -71,13 +71,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 +104,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 +121,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase { $newServices->defineService( 'Test', - function() use ( &$instantiatorReturnValues ) { + function () use ( &$instantiatorReturnValues ) { return array_shift( $instantiatorReturnValues ); } ); @@ -150,7 +150,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase { $newServices->redefineService( 'DBLoadBalancerFactory', - function() use ( $lbFactory ) { + function () use ( $lbFactory ) { return $lbFactory; } ); @@ -178,11 +178,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 +194,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase { $newServices->defineService( 'Test', - function() use ( &$instantiatorReturnValues ) { + function () use ( &$instantiatorReturnValues ) { return array_shift( $instantiatorReturnValues ); } ); @@ -217,9 +217,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 +247,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 +303,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase { 'MainConfig' => [ 'MainConfig', Config::class ], 'SiteStore' => [ 'SiteStore', SiteStore::class ], 'SiteLookup' => [ 'SiteLookup', SiteLookup::class ], - 'StatsdDataFactory' => [ 'StatsdDataFactory', StatsdDataFactory::class ], + 'StatsdDataFactory' => [ 'StatsdDataFactory', MediawikiStatsdDataFactory::class ], 'InterwikiLookup' => [ 'InterwikiLookup', InterwikiLookup::class ], 'EventRelayerGroup' => [ 'EventRelayerGroup', EventRelayerGroup::class ], 'SearchEngineFactory' => [ 'SearchEngineFactory', SearchEngineFactory::class ],