Merge "tests: Add explicit return type void to setUp() and tearDown()"

.phpcs.xml

@@ -17,7 +17,6 @@
 		<exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgTitle" />
 		<exclude name="MediaWiki.Usage.ForbiddenFunctions.passthru" />
 		<exclude name="MediaWiki.Usage.NullableType.PHP71NullableStyle" />
-		<exclude name="MediaWiki.Usage.PHPUnitTypeHints.MissingTypehint" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
 		<exclude name="PSR12.Properties.ConstantVisibility.NotFound" />

tests/integration/includes/http/MWHttpRequestTestCase.php

@@ -11,7 +11,7 @@ abstract class MWHttpRequestTestCase extends PHPUnit\Framework\TestCase {
 	/** @var HttpRequestFactory */
 	private $factory;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->oldHttpEngine = Http::$httpEngine;
 		Http::$httpEngine = static::$httpEngine;
@@ -31,7 +31,7 @@ abstract class MWHttpRequestTestCase extends PHPUnit\Framework\TestCase {
 		}
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		parent::tearDown();
 		Http::$httpEngine = $this->oldHttpEngine;
 	}

tests/integration/includes/shell/FirejailCommandIntegrationTest.php

@@ -14,7 +14,7 @@ use MediaWiki\Shell\Shell;
  */
 class FirejailCommandIntegrationTest extends PHPUnit\Framework\TestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		if ( Shell::isDisabled() ) {
 			$this->markTestSkipped( 'shelling out is disabled' );

tests/phpunit/MediaWikiIntegrationTestCase.php

@@ -709,7 +709,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 	 *
 	 * @par Example
 	 * @code
-	 *     protected function setUp() {
+	 *     protected function setUp() : void {
 	 *         $this->setMwGlobals( 'wgRestrictStuff', true );
 	 *     }
 	 *

tests/phpunit/MediaWikiLangTestCase.php

@@ -6,7 +6,7 @@ use MediaWiki\MediaWikiServices;
  * Base class that store and restore the Language objects
  */
 abstract class MediaWikiLangTestCase extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		global $wgLanguageCode;
 
 		$contLang = MediaWikiServices::getInstance()->getContentLanguage();

tests/phpunit/MediaWikiUnitTestCase.php

@@ -117,7 +117,7 @@ abstract class MediaWikiUnitTestCase extends TestCase {
 		] ) );
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		// Quick reset between tests
 		foreach ( $GLOBALS as $key => $_ ) {
 			if ( $key !== 'GLOBALS' && !array_key_exists( $key, self::$unitGlobals ) ) {

tests/phpunit/ResourceLoaderTestCase.php

@@ -76,7 +76,7 @@ abstract class ResourceLoaderTestCase extends MediaWikiTestCase {
 		return new HashConfig( self::getSettings() );
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		ResourceLoader::clearCache();

tests/phpunit/includes/ActorMigrationTest.php

@@ -17,7 +17,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
 		'actor',
 	];
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$w = TestingAccessWrapper::newFromClass( ActorMigration::class );
@@ -48,7 +48,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
 		];
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		parent::tearDown();
 		ScopedCallback::consume( $this->resetActorMigration );
 	}

tests/phpunit/includes/AutoLoaderTest.php

@@ -7,7 +7,7 @@ class AutoLoaderTest extends MediaWikiTestCase {
 
 	private $oldPsr4;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// Fancy dance to trigger a rebuild of AutoLoader::$autoloadLocalClassesLower
@@ -30,7 +30,7 @@ class AutoLoaderTest extends MediaWikiTestCase {
 			__DIR__ . '/../data/autoloader/psr4';
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		AutoLoader::$psr4Namespaces = $this->oldPsr4;
 		parent::tearDown();
 	}

tests/phpunit/includes/CategoryTest.php

@@ -5,7 +5,7 @@
  * @group Category
  */
 class CategoryTest extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/ContentSecurityPolicyTest.php

@@ -6,7 +6,7 @@ class ContentSecurityPolicyTest extends MediaWikiTestCase {
 	/** @var ContentSecurityPolicy */
 	private $csp;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		global $wgUploadDirectory;
 		$this->setMwGlobals( [
 			'wgAllowExternalImages' => false,
@@ -49,7 +49,7 @@ class ContentSecurityPolicyTest extends MediaWikiTestCase {
 		$this->csp = TestingAccessWrapper::newFromObject( $csp );
 		$this->csp->nonce = 'secret';
 
-		return parent::setUp();
+		parent::setUp();
 	}
 
 	/**

tests/phpunit/includes/DeprecatedGlobalTest.php

@@ -26,12 +26,12 @@ use PHPUnit\Framework\Error\Deprecated;
 class DeprecatedGlobalTest extends MediaWikiTestCase {
 	private $oldErrorLevel;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->oldErrorLevel = error_reporting( -1 );
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		error_reporting( $this->oldErrorLevel );
 		parent::tearDown();
 	}

tests/phpunit/includes/DiffHistoryBlobTest.php

@@ -2,7 +2,7 @@
 
 class DiffHistoryBlobTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->checkPHPExtension( 'hash' );

tests/phpunit/includes/EditPageTest.php

@@ -13,7 +13,7 @@ use MediaWiki\MediaWikiServices;
  */
 class EditPageTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$contLang = MediaWikiServices::getInstance()->getContentLanguage();

tests/phpunit/includes/ExportTest.php

@@ -11,7 +11,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ExportTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgCapitalLinks' => true,

tests/phpunit/includes/ExtraParserTest.php

@@ -15,7 +15,7 @@ class ExtraParserTest extends MediaWikiTestCase {
 	/** @var Parser */
 	protected $parser;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/FauxRequestTest.php

@@ -6,12 +6,12 @@ class FauxRequestTest extends PHPUnit\Framework\TestCase {
 
 	use MediaWikiCoversValidator;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->orgWgServer = $GLOBALS['wgServer'];
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		$GLOBALS['wgServer'] = $this->orgWgServer;
 		parent::tearDown();
 	}

tests/phpunit/includes/GitInfoTest.php

@@ -37,7 +37,7 @@ class GitInfoTest extends MediaWikiTestCase {
 		}
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( 'wgGitInfoCacheDirectory', __DIR__ . '/../data/gitinfo' );
 	}

tests/phpunit/includes/GlobalFunctions/GlobalTest.php

@@ -7,7 +7,7 @@ use MediaWiki\Logger\LegacyLogger;
  * @group GlobalFunctions
  */
 class GlobalTest extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$readOnlyFile = $this->getNewTempFile();

tests/phpunit/includes/GlobalFunctions/wfParseUrlTest.php

@@ -25,7 +25,7 @@
  * @covers ::wfParseUrl
  */
 class WfParseUrlTest extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( 'wgUrlProtocols', [

tests/phpunit/includes/GlobalFunctions/wfThumbIsStandardTest.php

@@ -8,7 +8,7 @@ use MediaWiki\MediaWikiServices;
  */
 class WfThumbIsStandardTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/HooksTest.php

@@ -4,7 +4,7 @@ use PHPUnit\Framework\Error\Deprecated;
 
 class HooksTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		global $wgHooks;
 		parent::setUp();
 		Hooks::clear( 'MediaWikiHooksTest001' );

tests/phpunit/includes/HtmlTest.php

@@ -6,7 +6,7 @@ use PHPUnit\Framework\Error\Notice;
 class HtmlTest extends MediaWikiTestCase {
 	private $restoreWarnings;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [
@@ -69,7 +69,7 @@ class HtmlTest extends MediaWikiTestCase {
 		$this->restoreWarnings = false;
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		if ( $this->restoreWarnings ) {
 			$this->restoreWarnings = false;
 			Wikimedia\restoreWarnings();

tests/phpunit/includes/LinkFilterTest.php

@@ -8,7 +8,7 @@ use Wikimedia\Rdbms\LikeMatch;
  */
 class LinkFilterTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( 'wgUrlProtocols', [

tests/phpunit/includes/MWTimestampTest.php

@@ -4,7 +4,7 @@
  * Tests timestamp parsing and output.
  */
 class MWTimestampTest extends MediaWikiLangTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// Avoid 'GetHumanTimestamp' hook and others

tests/phpunit/includes/MediaWikiTest.php

@@ -3,7 +3,7 @@
 class MediaWikiTest extends MediaWikiTestCase {
 	private $oldServer, $oldGet, $oldPost;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [
@@ -20,7 +20,7 @@ class MediaWikiTest extends MediaWikiTestCase {
 		$this->oldPost = $_POST;
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		parent::tearDown();
 		$_SERVER = $this->oldServer;
 		$_GET = $this->oldGet;

tests/phpunit/includes/MessageTest.php

@@ -8,7 +8,7 @@ use Wikimedia\TestingAccessWrapper;
  */
 class MessageTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/MovePageTest.php

@@ -95,7 +95,7 @@ class MovePageTest extends MediaWikiTestCase {
 		);
 	}
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		// Ensure we have some pages that are guaranteed to exist or not

tests/phpunit/includes/MultiHttpClientTest.php

@@ -8,7 +8,7 @@
 class MultiHttpClientTest extends MediaWikiTestCase {
 	protected $client;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$client = $this->getMockBuilder( MultiHttpClient::class )
 			->setConstructorArgs( [ [] ] )

tests/phpunit/includes/OutputPageTest.php

@@ -22,12 +22,12 @@ class OutputPageTest extends MediaWikiTestCase {
 	// @codingStandardsIgnoreEnd
 
 	// Ensure that we don't affect the global ResourceLoader state.
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		ResourceLoader::clearCache();
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		parent::tearDown();
 		ResourceLoader::clearCache();
 	}

tests/phpunit/includes/PagePropsTest.php

@@ -28,7 +28,7 @@ class PagePropsTest extends MediaWikiLangTestCase {
 	 */
 	private $the_properties;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/Permissions/PermissionManagerTest.php

@@ -53,7 +53,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase {
 	/** Constant for self::testIsBlockedFrom */
 	const USER_TALK_PAGE = '<user talk page>';
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$localZone = 'UTC';
@@ -124,7 +124,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase {
 		}
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		parent::tearDown();
 		$this->restoreMwServices();
 	}

tests/phpunit/includes/PrefixSearchTest.php

@@ -43,7 +43,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase {
 		$this->insertPage( Title::makeTitle( self::NS_NONCAP, 'sandbox' ) );
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		if ( !$this->isWikitextNS( NS_MAIN ) ) {
@@ -62,7 +62,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase {
 		TestingAccessWrapper::newFromClass( Hooks::class )->handlers = [];
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		parent::tearDown();
 
 		TestingAccessWrapper::newFromClass( Hooks::class )->handlers = $this->originalHandlers;

tests/phpunit/includes/Revision/MutableRevisionRecordTest.php

@@ -25,7 +25,7 @@ class MutableRevisionRecordTest extends MediaWikiTestCase {
 
 	use RevisionRecordTests;
 
-	public function setUp() {
+	public function setUp() : void {
 		Title::clearCaches();
 		parent::setUp();
 	}

tests/phpunit/includes/Revision/RenderedRevisionTest.php

@@ -31,7 +31,7 @@ class RenderedRevisionTest extends MediaWikiTestCase {
 	/** @var callable */
 	private $combinerCallback;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->combinerCallback = function ( RenderedRevision $rr, array $hints = [] ) {

tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php

@@ -71,7 +71,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase {
 	 */
 	abstract protected function getMcrTablesToReset();
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed[] = 'archive';
 		$this->tablesUsed[] = 'page';

tests/phpunit/includes/RevisionDbTestBase.php

@@ -61,7 +61,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
 	 */
 	abstract protected function getMcrTablesToReset();
 
-	protected function setUp() {
+	protected function setUp() : void {
 		$this->tablesUsed += $this->getMcrTablesToReset();
 
 		parent::setUp();

tests/phpunit/includes/RevisionMcrDbTest.php

@@ -19,7 +19,7 @@ class RevisionMcrDbTest extends RevisionDbTestBase {
 
 	use McrSchemaOverride;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 	}
 

tests/phpunit/includes/RevisionTest.php

@@ -17,7 +17,7 @@ use Wikimedia\Rdbms\LoadBalancer;
  */
 class RevisionTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals(
 			'wgMultiContentRevisionSchemaMigrationStage',

tests/phpunit/includes/SampleTest.php

@@ -8,7 +8,7 @@ class SampleTest extends MediaWikiLangTestCase {
 	/**
 	 * Anything that needs to happen before your tests should go here.
 	 */
-	protected function setUp() {
+	protected function setUp() : void {
 		// Be sure to call the parent setup and teardown functions.
 		// This makes sure that all the various cleanup and restorations
 		// happen as they should (including the restoration for setMwGlobals).
@@ -25,7 +25,7 @@ class SampleTest extends MediaWikiLangTestCase {
 	/**
 	 * Anything cleanup you need to do should go here.
 	 */
-	protected function tearDown() {
+	protected function tearDown() : void {
 		parent::tearDown();
 	}
 

tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php

@@ -33,7 +33,7 @@ use DeferredUpdates;
  */
 class DerivedPageDataUpdaterTest extends MediaWikiTestCase {
 
-	public function tearDown() {
+	public function tearDown() : void {
 		MWTimestamp::setFakeTime( false );
 
 		parent::tearDown();

tests/phpunit/includes/Storage/NameTableStoreTest.php

@@ -25,7 +25,7 @@ use Wikimedia\TestingAccessWrapper;
  */
 class NameTableStoreTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		$this->tablesUsed[] = 'slot_roles';
 		parent::setUp();
 	}

tests/phpunit/includes/Storage/PageUpdaterTest.php

@@ -22,7 +22,7 @@ use WikiPage;
  */
 class PageUpdaterTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		MediaWikiServices::getInstance()->getSlotRoleRegistry()->defineRoleWithModel(

tests/phpunit/includes/TemplateParserTest.php

@@ -8,7 +8,7 @@ class TemplateParserTest extends MediaWikiTestCase {
 
 	protected $templateDir;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/TimeAdjustTest.php

@@ -3,7 +3,7 @@
 use MediaWiki\MediaWikiServices;
 
 class TimeAdjustTest extends MediaWikiLangTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 	}
 

tests/phpunit/includes/TitleMethodsTest.php

@@ -12,7 +12,7 @@ use MediaWiki\MediaWikiServices;
  */
 class TitleMethodsTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->mergeMwGlobalArrayValue(
@@ -462,7 +462,7 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		Title::clearCaches();
 		parent::tearDown();
 	}

tests/phpunit/includes/TitlePermissionTest.php

@@ -28,7 +28,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 */
 	protected $user, $anonUser, $userUser, $altUser;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$localZone = 'UTC';

tests/phpunit/includes/TitleTest.php

@@ -9,7 +9,7 @@ use MediaWiki\MediaWikiServices;
  * @group Title
  */
 class TitleTest extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/WebRequestTest.php

@@ -5,7 +5,7 @@
  */
 class WebRequestTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->oldServer = $_SERVER;
@@ -13,7 +13,7 @@ class WebRequestTest extends MediaWikiTestCase {
 		$this->oldWgServer = $GLOBALS['wgServer'];
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		$_SERVER = $this->oldServer;
 		$GLOBALS['wgRequest'] = $this->oldWgRequest;
 		$GLOBALS['wgServer'] = $this->oldWgServer;

tests/phpunit/includes/WikiMapTest.php

@@ -9,7 +9,7 @@ use Wikimedia\Rdbms\DatabaseDomain;
  */
 class WikiMapTest extends MediaWikiLangTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$conf = new SiteConfiguration();

tests/phpunit/includes/XmlTest.php

@@ -7,7 +7,7 @@ use MediaWiki\MediaWikiServices;
  */
 class XmlTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$langObj = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );

tests/phpunit/includes/actions/ActionTest.php

@@ -14,7 +14,7 @@ use MediaWiki\Block\Restriction\PageRestriction;
  */
 class ActionTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$context = $this->getContext();

tests/phpunit/includes/actions/WatchActionTest.php

@@ -19,7 +19,7 @@ class WatchActionTest extends MediaWikiTestCase {
 	 */
 	private $testWikiPage;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$testTitle = Title::newFromText( 'UTTest' );
@@ -32,7 +32,7 @@ class WatchActionTest extends MediaWikiTestCase {
 	/**
 	 * @throws MWException
 	 */
-	protected function tearDown() {
+	protected function tearDown() : void {
 		parent::tearDown();
 
 		Hooks::clear( 'WatchArticle' );

tests/phpunit/includes/api/ApiBlockTest.php

@@ -14,7 +14,7 @@ use MediaWiki\Block\Restriction\NamespaceRestriction;
 class ApiBlockTest extends ApiTestCase {
 	protected $mUser = null;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed = array_merge(
 			$this->tablesUsed,

tests/phpunit/includes/api/ApiCSPReportTest.php

@@ -7,7 +7,7 @@
  */
 class ApiCSPReportTest extends MediaWikiIntegrationTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'CSPFalsePositiveUrls' => [],

tests/phpunit/includes/api/ApiDeleteTest.php

@@ -13,7 +13,7 @@
  */
 class ApiDeleteTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed = array_merge(
 			$this->tablesUsed,

tests/phpunit/includes/api/ApiEditPageTest.php

@@ -15,7 +15,7 @@ use MediaWiki\Block\DatabaseBlock;
  */
 class ApiEditPageTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/api/ApiLoginTest.php

@@ -13,7 +13,7 @@ use Wikimedia\TestingAccessWrapper;
  * @covers ApiLogin
  */
 class ApiLoginTest extends ApiTestCase {
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'bot_passwords';

tests/phpunit/includes/api/ApiLogoutTest.php

@@ -9,7 +9,7 @@
  */
 class ApiLogoutTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		global $wgRequest, $wgUser;
 
 		parent::setUp();

tests/phpunit/includes/api/ApiOptionsTest.php

@@ -21,7 +21,7 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
 
 	private static $Success = [ 'options' => 'success' ];
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->mUserMock = $this->getMockBuilder( User::class )

tests/phpunit/includes/api/ApiQueryLanguageinfoTest.php

@@ -8,7 +8,7 @@
  */
 class ApiQueryLanguageinfoTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		// register custom language names so this test is independent of CLDR
 		$this->setTemporaryHook(

tests/phpunit/includes/api/ApiQueryPrefixSearchTest.php

@@ -10,7 +10,7 @@
 class ApiQueryPrefixSearchTest extends ApiTestCase {
 	const TEST_QUERY = 'unittest';
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgSearchType' => MockCompletionSearchEngine::class,

tests/phpunit/includes/api/ApiQueryRecentChangesIntegrationTest.php

@@ -19,7 +19,7 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
 		$this->tablesUsed[] = 'page';
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		self::$users['ApiQueryRecentChangesIntegrationTestUser'] = $this->getMutableTestUser();

tests/phpunit/includes/api/ApiQuerySearchTest.php

@@ -93,7 +93,7 @@ class ApiQuerySearchTest extends ApiTestCase {
 		$this->assertEquals( $expect, $results );
 	}
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		MockSearchEngine::clearMockResults();
 		$this->registerMockSearchEngine();

tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php

@@ -20,7 +20,7 @@ class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
 		);
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		self::$users['ApiQueryWatchlistIntegrationTestUser'] = $this->getMutableTestUser();
 		self::$users['ApiQueryWatchlistIntegrationTestUser2'] = $this->getMutableTestUser();

tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php

@@ -11,7 +11,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ApiQueryWatchlistRawIntegrationTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		self::$users['ApiQueryWatchlistRawIntegrationTestUser']
 			= $this->getMutableTestUser();

tests/phpunit/includes/api/ApiRevisionDeleteTest.php

@@ -15,7 +15,7 @@ class ApiRevisionDeleteTest extends ApiTestCase {
 	public static $page = 'Help:ApiRevDel_test';
 	public $revs = [];
 
-	protected function setUp() {
+	protected function setUp() : void {
 		// Needs to be before setup since this gets cached
 		$this->mergeMwGlobalArrayValue(
 			'wgGroupPermissions',

tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php

@@ -11,7 +11,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ApiSetNotificationTimestampIntegrationTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		self::$users[__CLASS__] = new TestUser( __CLASS__ );
 	}

tests/phpunit/includes/api/ApiStashEditTest.php

@@ -13,7 +13,7 @@ use Psr\Log\NullLogger;
  * @group Database
  */
 class ApiStashEditTest extends ApiTestCase {
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->setService( 'PageEditStash', new PageEditStash(
 			new HashBagOStuff( [] ),
@@ -26,7 +26,7 @@ class ApiStashEditTest extends ApiTestCase {
 		$this->setMwGlobals( 'wgMainCacheType', 'hash' );
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		parent::tearDown();
 	}
 

tests/phpunit/includes/api/ApiTestCase.php

@@ -15,7 +15,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	 */
 	protected $apiContext;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		global $wgServer;
 
 		parent::setUp();
@@ -36,7 +36,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$this->apiContext = new ApiTestContext();
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		// Avoid leaking session over tests
 		MediaWiki\Session\SessionManager::getGlobalSession()->clear();
 

tests/phpunit/includes/api/ApiUnblockTest.php

@@ -16,7 +16,7 @@ class ApiUnblockTest extends ApiTestCase {
 	/** @var User */
 	private $blockee;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed = array_merge(

tests/phpunit/includes/api/ApiUploadTest.php

@@ -12,7 +12,7 @@ class ApiUploadTest extends ApiUploadTestCase {
 		return __DIR__ . '/../../data/media/' . $fileName;
 	}
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed[] = 'watchlist'; // This test might interfere with watchlists test.
 		$this->tablesUsed = array_merge( $this->tablesUsed, LocalFile::getQueryInfo()['tables'] );

tests/phpunit/includes/api/ApiUploadTestCase.php

@@ -7,7 +7,7 @@ abstract class ApiUploadTestCase extends ApiTestCase {
 	/**
 	 * Fixture -- run before every test
 	 */
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/api/ApiUserrightsTest.php

@@ -12,7 +12,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ApiUserrightsTest extends ApiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed = array_merge(
 			$this->tablesUsed,

tests/phpunit/includes/api/format/ApiFormatBaseTest.php

@@ -10,7 +10,7 @@ class ApiFormatBaseTest extends ApiFormatTestBase {
 
 	protected $printerName = 'mockbase';
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgServer' => 'http://example.org'

tests/phpunit/includes/api/query/ApiQueryTest.php

@@ -7,7 +7,7 @@
  * @covers ApiQuery
  */
 class ApiQueryTest extends ApiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// Setup apiquerytestiw: as interwiki prefix

tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php

@@ -12,7 +12,7 @@ class UserDataAuthenticationRequestTest extends AuthenticationRequestTestCase {
 		return new UserDataAuthenticationRequest;
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( 'wgHiddenPrefs', [] );
 	}

tests/phpunit/includes/block/BlockManagerTest.php

@@ -22,7 +22,7 @@ class BlockManagerTest extends MediaWikiTestCase {
 	/** @var int */
 	protected $sysopId;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->user = $this->getTestUser()->getUser();

tests/phpunit/includes/block/BlockRestrictionStoreTest.php

@@ -19,13 +19,13 @@ class BlockRestrictionStoreTest extends \MediaWikiLangTestCase {
 	/** @var BlockRestrictionStore */
 	protected $blockRestrictionStore;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->blockRestrictionStore = MediaWikiServices::getInstance()->getBlockRestrictionStore();
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		parent::tearDown();
 		$this->resetTables();
 	}

tests/phpunit/includes/cache/LocalisationCacheTest.php

@@ -11,7 +11,7 @@ use Psr\Log\NullLogger;
  * @author Niklas Laxström
  */
 class LocalisationCacheTest extends MediaWikiTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgExtensionMessagesFiles' => [],

tests/phpunit/includes/cache/MessageCacheTest.php

@@ -10,7 +10,7 @@ use Wikimedia\TestingAccessWrapper;
  */
 class MessageCacheTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->configureLanguages();
 		MessageCache::singleton()->enable();

tests/phpunit/includes/changes/CategoryMembershipChangeTest.php

@@ -45,7 +45,7 @@ class CategoryMembershipChangeTest extends MediaWikiLangTestCase {
 		return self::$mockRecentChange;
 	}
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		self::$notifyCallCounter = 0;
 		self::$mockRecentChange = $this->createMock( RecentChange::class );

tests/phpunit/includes/changes/ChangesListFilterTest.php

@@ -8,7 +8,7 @@ use Wikimedia\TestingAccessWrapper;
 class ChangesListFilterTest extends MediaWikiTestCase {
 	protected $group;
 
-	public function setUp() {
+	public function setUp() : void {
 		$this->group = $this->getGroup( [ 'name' => 'group' ] );
 
 		parent::setUp();

tests/phpunit/includes/changes/OldChangesListTest.php

@@ -24,7 +24,7 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 		$this->testRecentChangesHelper = new TestRecentChangesHelper();
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/changes/RCCacheEntryFactoryTest.php

@@ -28,7 +28,7 @@ class RCCacheEntryFactoryTest extends MediaWikiLangTestCase {
 		$this->testRecentChangesHelper = new TestRecentChangesHelper();
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [

tests/phpunit/includes/changes/RecentChangeTest.php

@@ -13,7 +13,7 @@ class RecentChangeTest extends MediaWikiTestCase {
 	protected $user_comment;
 	protected $context;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->title = Title::newFromText( 'SomeTitle' );

tests/phpunit/includes/changetags/ChangeTagsTest.php

@@ -8,7 +8,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ChangeTagsTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'change_tag';

tests/phpunit/includes/collation/CollationTest.php

@@ -8,7 +8,7 @@
  * @covers UppercaseCollation
  */
 class CollationTest extends MediaWikiLangTestCase {
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->checkPHPExtension( 'intl' );
 	}

tests/phpunit/includes/collation/CustomUppercaseCollationTest.php

@@ -7,7 +7,7 @@ use MediaWiki\MediaWikiServices;
  */
 class CustomUppercaseCollationTest extends MediaWikiTestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		$this->collation = new CustomUppercaseCollation( [
 			'D',
 			'C',

tests/phpunit/includes/content/ContentHandlerTest.php

@@ -9,7 +9,7 @@ use Wikimedia\TestingAccessWrapper;
  */
 class ContentHandlerTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setMwGlobals( [
@@ -39,7 +39,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
 		MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' );
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		// Reset LinkCache
 		MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' );
 

tests/phpunit/includes/content/CssContentTest.php

@@ -9,7 +9,7 @@
  */
 class CssContentTest extends JavaScriptContentTest {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// Anon user

tests/phpunit/includes/content/FileContentHandlerTest.php

@@ -11,7 +11,7 @@ class FileContentHandlerTest extends MediaWikiLangTestCase {
 	 */
 	private $handler;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->handler = new FileContentHandler();

tests/phpunit/includes/content/TextContentTest.php

@@ -10,7 +10,7 @@ use MediaWiki\MediaWikiServices;
 class TextContentTest extends MediaWikiLangTestCase {
 	protected $context;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// trigger purging of all page related tables
@@ -40,7 +40,7 @@ class TextContentTest extends MediaWikiLangTestCase {
 		MWTidy::destroySingleton();
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		MWTidy::destroySingleton();
 		parent::tearDown();
 	}

tests/phpunit/includes/content/WikitextContentHandlerTest.php

@@ -13,7 +13,7 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
 	 */
 	private $handler;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );

tests/phpunit/includes/debug/DeprecationHelperTest.php

@@ -13,7 +13,7 @@ class DeprecationHelperTest extends MediaWikiTestCase {
 	/** @var TestDeprecatedSubclass */
 	private $testSubclass;
 
-	public function setUp() {
+	public function setUp() : void {
 		parent::setUp();
 		$this->testClass = new TestDeprecatedClass();
 		$this->testSubclass = new TestDeprecatedSubclass();

tests/phpunit/includes/debug/MWDebugTest.php

@@ -2,7 +2,7 @@
 
 class MWDebugTest extends MediaWikiTestCase {
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		/** Clear log before each test */
 		MWDebug::clearLog();

tests/phpunit/includes/deferred/LinksUpdateTest.php

@@ -28,7 +28,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->replace(

tests/phpunit/includes/deferred/SearchUpdateTest.php

@@ -10,7 +10,7 @@ class SearchUpdateTest extends MediaWikiTestCase {
 	 */
 	private $su;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->su = new SearchUpdate( 0, Title::newMainPage() );
 	}

tests/phpunit/includes/diff/DifferenceEngineTest.php

@@ -21,7 +21,7 @@ class DifferenceEngineTest extends MediaWikiTestCase {
 
 	private static $revisions;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$title = $this->getTitle();

tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php

@@ -54,7 +54,7 @@ class FileBackendIntegrationTest extends MediaWikiIntegrationTestCase {
 	public $singleBackend;
 	private static $backendToUse;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		global $wgFileBackends;
 		parent::setUp();
 		$tmpDir = $this->getNewTempDirectory();