diff options
Diffstat (limited to 'tests/phpunit/unit/includes')
16 files changed, 48 insertions, 48 deletions
diff --git a/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php b/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php index 8680d93b7ab4..4688061fb8ff 100644 --- a/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php +++ b/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php @@ -21,7 +21,7 @@ class MessageFormatterFactoryTest extends MediaWikiUnitTestCase { * @param string $lang * @param string|null $format */ - public function testGetTextFormatter( string $lang, string $format = null ) { + public function testGetTextFormatter( string $lang, ?string $format = null ) { if ( $format ) { $factory = new MessageFormatterFactory( $format ); } else { diff --git a/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php b/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php index 3282e609a3b2..837cc9e8f50f 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php +++ b/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php @@ -35,7 +35,7 @@ trait ActionModuleBasedHandlerTestTrait { ApiMain $main, $name, $resultData, - Exception $throwException = null + ?Exception $throwException = null ) { /** @var ApiBase|MockObject $module */ $module = $this->getMockBuilder( ApiBase::class ) diff --git a/tests/phpunit/unit/includes/Rest/Handler/HandlerTestTrait.php b/tests/phpunit/unit/includes/Rest/Handler/HandlerTestTrait.php index cf0695c65072..3a64f2a7794d 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/HandlerTestTrait.php +++ b/tests/phpunit/unit/includes/Rest/Handler/HandlerTestTrait.php @@ -52,8 +52,8 @@ trait HandlerTestTrait { RequestInterface $request, $config = [], $hooks = [], - Authority $authority = null, - Session $session = null, + ?Authority $authority = null, + ?Session $session = null, $routerOrModule = null ) { $formatter = $this->getDummyTextFormatter( true ); @@ -153,7 +153,7 @@ trait HandlerTestTrait { */ private function validateHandler( Handler $handler, - Validator $validator = null + ?Validator $validator = null ) { if ( !$validator ) { $serviceContainer = $this->getServiceContainer(); @@ -209,8 +209,8 @@ trait HandlerTestTrait { $hooks = [], $validatedParams = [], $validatedBody = [], - Authority $authority = null, - Session $session = null, + ?Authority $authority = null, + ?Session $session = null, $routerOrModule = null ): ResponseInterface { // supply defaults for required fields in $config @@ -262,8 +262,8 @@ trait HandlerTestTrait { $hooks = [], $validatedParams = [], $validatedBody = [], - Authority $authority = null, - Session $session = null + ?Authority $authority = null, + ?Session $session = null ): array { $response = $this->executeHandler( $handler, $request, $config, $hooks, $validatedParams, $validatedBody, $authority, $session ); diff --git a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php index 037a59290efb..001e65e9e6a8 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php +++ b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php @@ -75,7 +75,7 @@ class SearchHandlerTest extends MediaWikiUnitTestCase { $redirectLookup = null, $pageStore = null, $mockTitleFormatter = null, - HookContainer $hookContainer = null + ?HookContainer $hookContainer = null ) { $sources = [ MainConfigNames::SearchType => 'test', diff --git a/tests/phpunit/unit/includes/Revision/SlotRoleRegistryTest.php b/tests/phpunit/unit/includes/Revision/SlotRoleRegistryTest.php index 76f29cfa5baf..415f78b8c967 100644 --- a/tests/phpunit/unit/includes/Revision/SlotRoleRegistryTest.php +++ b/tests/phpunit/unit/includes/Revision/SlotRoleRegistryTest.php @@ -30,7 +30,7 @@ class SlotRoleRegistryTest extends MediaWikiUnitTestCase { return $mock; } - private function newSlotRoleRegistry( NameTableStore $roleNameStore = null ) { + private function newSlotRoleRegistry( ?NameTableStore $roleNameStore = null ) { if ( !$roleNameStore ) { $roleNameStore = $this->makeNameTableStore(); } diff --git a/tests/phpunit/unit/includes/auth/AuthenticationProviderTestTrait.php b/tests/phpunit/unit/includes/auth/AuthenticationProviderTestTrait.php index 7284d6cfaeb0..7605e02c914f 100644 --- a/tests/phpunit/unit/includes/auth/AuthenticationProviderTestTrait.php +++ b/tests/phpunit/unit/includes/auth/AuthenticationProviderTestTrait.php @@ -33,11 +33,11 @@ trait AuthenticationProviderTestTrait { */ private function initProvider( AbstractAuthenticationProvider $provider, - Config $config = null, - LoggerInterface $logger = null, - AuthManager $manager = null, - HookContainer $hookContainer = null, - UserNameUtils $userNameUtils = null + ?Config $config = null, + ?LoggerInterface $logger = null, + ?AuthManager $manager = null, + ?HookContainer $hookContainer = null, + ?UserNameUtils $userNameUtils = null ) { $provider->init( $logger ?? new NullLogger(), diff --git a/tests/phpunit/unit/includes/block/BlockUtilsTest.php b/tests/phpunit/unit/includes/block/BlockUtilsTest.php index deabdc4d51f1..32f897d11221 100644 --- a/tests/phpunit/unit/includes/block/BlockUtilsTest.php +++ b/tests/phpunit/unit/includes/block/BlockUtilsTest.php @@ -26,7 +26,7 @@ class BlockUtilsTest extends MediaWikiUnitTestCase { */ private function getUtils( array $options = [], - UserIdentityLookup $userIdentityLookup = null + ?UserIdentityLookup $userIdentityLookup = null ) { $baseOptions = [ MainConfigNames::BlockCIDRLimit => [ diff --git a/tests/phpunit/unit/includes/libs/ParamValidator/TypeDefTest.php b/tests/phpunit/unit/includes/libs/ParamValidator/TypeDefTest.php index a258a8451c5c..ab4fa38b7bc2 100644 --- a/tests/phpunit/unit/includes/libs/ParamValidator/TypeDefTest.php +++ b/tests/phpunit/unit/includes/libs/ParamValidator/TypeDefTest.php @@ -67,7 +67,7 @@ class TypeDefTest extends TestCase { } /** @dataProvider provideFailureMessage */ - public function testFailureMessage( $expect, $code, array $data = null, $suffix = null ) { + public function testFailureMessage( $expect, $code, ?array $data = null, $suffix = null ) { $typeDef = $this->getMockBuilder( TypeDef::class ) ->setConstructorArgs( [ new SimpleCallbacks( [] ) ] ) ->getMockForAbstractClass(); diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DBConnRefTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DBConnRefTest.php index 7d34478e24fe..ce99106e8f1d 100644 --- a/tests/phpunit/unit/includes/libs/rdbms/database/DBConnRefTest.php +++ b/tests/phpunit/unit/includes/libs/rdbms/database/DBConnRefTest.php @@ -83,7 +83,7 @@ class DBConnRefTest extends TestCase { * @param ILoadBalancer|null $lb * @return IDatabase */ - private function getDBConnRef( ILoadBalancer $lb = null ) { + private function getDBConnRef( ?ILoadBalancer $lb = null ) { $lb ??= $this->getLoadBalancerMock(); return new DBConnRef( $lb, [ DB_PRIMARY, [], 'mywiki', 0 ], DB_PRIMARY ); } diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php index 3c513068fd5a..d246b76f9448 100644 --- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php +++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php @@ -129,7 +129,7 @@ class DatabaseTest extends TestCase { /** * @dataProvider provideTableName */ - public function testTableName( $expected, $table, $format, array $alias = null ) { + public function testTableName( $expected, $table, $format, ?array $alias = null ) { // Use MockDatabase to avoid useless stub SQLPlatformTestHelper::addIdentifierQuotes $db = new MockDatabase(); if ( $alias ) { diff --git a/tests/phpunit/unit/includes/mail/EmailUserTest.php b/tests/phpunit/unit/includes/mail/EmailUserTest.php index 6b8392690a20..01cf063d1551 100644 --- a/tests/phpunit/unit/includes/mail/EmailUserTest.php +++ b/tests/phpunit/unit/includes/mail/EmailUserTest.php @@ -28,12 +28,12 @@ use Wikimedia\Message\ITextFormatter; class EmailUserTest extends MediaWikiUnitTestCase { private function getEmailUser( Authority $sender, - UserOptionsLookup $userOptionsLookup = null, - CentralIdLookup $centralIdLookup = null, - UserFactory $userFactory = null, + ?UserOptionsLookup $userOptionsLookup = null, + ?CentralIdLookup $centralIdLookup = null, + ?UserFactory $userFactory = null, array $configOverrides = [], array $hooks = [], - IEmailer $emailer = null + ?IEmailer $emailer = null ): EmailUser { $options = new ServiceOptions( EmailUser::CONSTRUCTOR_OPTIONS, @@ -66,8 +66,8 @@ class EmailUserTest extends MediaWikiUnitTestCase { User $target, User $sender, StatusValue $expected, - UserOptionsLookup $userOptionsLookup = null, - CentralIdLookup $centralIdLookup = null + ?UserOptionsLookup $userOptionsLookup = null, + ?CentralIdLookup $centralIdLookup = null ) { $userFactory = $this->createMock( UserFactory::class ); $userFactory->method( 'newFromAuthority' )->willReturn( $sender ); @@ -350,7 +350,7 @@ class EmailUserTest extends MediaWikiUnitTestCase { Authority $sender, StatusValue $expected, array $hooks = [], - IEmailer $emailer = null + ?IEmailer $emailer = null ) { $userFactory = $this->createMock( UserFactory::class ); $userFactory->method( 'newFromUserIdentity' ) diff --git a/tests/phpunit/unit/includes/page/DeletePageTest.php b/tests/phpunit/unit/includes/page/DeletePageTest.php index eeeb662afb3b..6d771012011e 100644 --- a/tests/phpunit/unit/includes/page/DeletePageTest.php +++ b/tests/phpunit/unit/includes/page/DeletePageTest.php @@ -79,11 +79,11 @@ class DeletePageTest extends MediaWikiUnitTestCase { private function getDeletePage( ProperPageIdentity $page, - Authority $deleter = null, - ServiceOptions $options = null, - RevisionStore $revStore = null, - WikiPageFactory $wpFactory = null, - NamespaceInfo $nsInfo = null + ?Authority $deleter = null, + ?ServiceOptions $options = null, + ?RevisionStore $revStore = null, + ?WikiPageFactory $wpFactory = null, + ?NamespaceInfo $nsInfo = null ): DeletePage { if ( !$wpFactory ) { $wpFactory = $this->createMock( WikiPageFactory::class ); @@ -131,9 +131,9 @@ class DeletePageTest extends MediaWikiUnitTestCase { public function testPermissions( Authority $authority, bool $expectedGood, - string $expectedMessage = null, - ServiceOptions $options = null, - RevisionStore $revStore = null + ?string $expectedMessage = null, + ?ServiceOptions $options = null, + ?RevisionStore $revStore = null ) { $dp = $this->getDeletePage( $this->getMockPage(), diff --git a/tests/phpunit/unit/includes/page/UndeletePageTest.php b/tests/phpunit/unit/includes/page/UndeletePageTest.php index f010f9761ded..542911750aa1 100644 --- a/tests/phpunit/unit/includes/page/UndeletePageTest.php +++ b/tests/phpunit/unit/includes/page/UndeletePageTest.php @@ -38,10 +38,10 @@ class UndeletePageTest extends MediaWikiUnitTestCase { * @return UndeletePage */ private function getUndeletePage( - ProperPageIdentity $page = null, - WikiPageFactory $wpFactory = null, - NamespaceInfo $namespaceInfo = null, - ArchivedRevisionLookup $archivedRevisionLookup = null + ?ProperPageIdentity $page = null, + ?WikiPageFactory $wpFactory = null, + ?NamespaceInfo $namespaceInfo = null, + ?ArchivedRevisionLookup $archivedRevisionLookup = null ): UndeletePage { return new UndeletePage( $this->createHookContainer(), diff --git a/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php b/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php index 94e8c79c4b61..37ccf1d318dd 100644 --- a/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php +++ b/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php @@ -119,7 +119,7 @@ class MagicWordArrayTest extends MediaWikiUnitTestCase { public function testMatchStartAndRemove( string $input, $expectedMatches, - string $expectedText = null + ?string $expectedText = null ) { $array = new MagicWordArray( [ 'ID' ], $this->getFactory() ); $text = $input; @@ -143,7 +143,7 @@ class MagicWordArrayTest extends MediaWikiUnitTestCase { public function testMatchAndRemove( string $input, array $expectedMatches = [], - string $expectedText = null + ?string $expectedText = null ) { $array = new MagicWordArray( [ 'ID' ], $this->getFactory() ); $text = $input; @@ -167,7 +167,7 @@ class MagicWordArrayTest extends MediaWikiUnitTestCase { public function testMatchAndRemoveMultiple( string $input, array $expectedMatches = [], - string $expectedText = null + ?string $expectedText = null ) { $array = new MagicWordArray( array_keys( self::MAGIC_WORDS ), $this->getFactory() ); $text = $input; diff --git a/tests/phpunit/unit/includes/session/SessionProviderTestTrait.php b/tests/phpunit/unit/includes/session/SessionProviderTestTrait.php index c53a0529d3c9..c7965b0b158a 100644 --- a/tests/phpunit/unit/includes/session/SessionProviderTestTrait.php +++ b/tests/phpunit/unit/includes/session/SessionProviderTestTrait.php @@ -32,11 +32,11 @@ trait SessionProviderTestTrait { */ private function initProvider( SessionProvider $provider, - LoggerInterface $logger = null, - Config $config = null, - SessionManager $manager = null, - HookContainer $hookContainer = null, - UserNameUtils $userNameUtils = null + ?LoggerInterface $logger = null, + ?Config $config = null, + ?SessionManager $manager = null, + ?HookContainer $hookContainer = null, + ?UserNameUtils $userNameUtils = null ) { $provider->init( $logger ?? new NullLogger(), diff --git a/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php index 4c156ec7a1fc..10160d84f7c4 100644 --- a/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php +++ b/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php @@ -45,7 +45,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiUnitTestCase { */ private function newService( IDatabase $mockDb, - UserOptionsLookup $userOptionsLookup = null + ?UserOptionsLookup $userOptionsLookup = null ) { return new WatchedItemQueryService( $this->getMockDbProvider( $mockDb ), |