Fix visibility of setUp/tearDown

Change-Id: I636be48eb9f713680abac35d46091f7b49374696

tests/integration/includes/http/MWHttpRequestTestCase.php

@@ -11,7 +11,7 @@ abstract class MWHttpRequestTestCase extends PHPUnit\Framework\TestCase {
 	/** @var HttpRequestFactory */
 	private $factory;
 
-	public function setUp() : void {
+	protected 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() : void {
+	protected 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() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		if ( Shell::isDisabled() ) {
 			$this->markTestSkipped( 'shelling out is disabled' );

tests/phpunit/includes/DeprecatedGlobalTest.php

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

tests/phpunit/includes/FauxRequestTest.php

@@ -4,7 +4,7 @@ use MediaWiki\Session\SessionManager;
 
 class FauxRequestTest extends MediaWikiIntegrationTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( 'wgServer', '//wiki.test' );
 	}

tests/phpunit/includes/HooksTest.php

@@ -6,7 +6,7 @@ use Wikimedia\ScopedCallback;
 
 class HooksTest extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		global $wgHooks;
 		parent::setUp();
 		unset( $wgHooks['MediaWikiHooksTest001'] );

tests/phpunit/includes/MovePageTest.php

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

tests/phpunit/includes/Revision/MutableRevisionRecordTest.php

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

tests/phpunit/includes/Revision/RenderedRevisionTest.php

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

tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php

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

tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php

@@ -33,7 +33,7 @@ use WikitextContent;
  */
 class DerivedPageDataUpdaterTest extends MediaWikiTestCase {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'page';

tests/phpunit/includes/Storage/NameTableStoreTest.php

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

tests/phpunit/includes/Storage/PageUpdaterTest.php

@@ -25,7 +25,7 @@ use WikiPage;
  */
 class PageUpdaterTest extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$slotRoleRegistry = MediaWikiServices::getInstance()->getSlotRoleRegistry();

tests/phpunit/includes/TitleMethodsTest.php

@@ -437,7 +437,7 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 		$this->assertSame( $expected, $title->getLinkURL( $query, $query2, $proto ) );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		Title::clearCaches();
 		parent::tearDown();
 	}

tests/phpunit/includes/WikiMapTest.php

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

tests/phpunit/includes/api/ApiCSPReportTest.php

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

tests/phpunit/includes/api/ApiLoginTest.php

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

tests/phpunit/includes/api/ApiQueryPrefixSearchTest.php

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

tests/phpunit/includes/api/ApiQuerySearchTest.php

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

tests/phpunit/includes/api/ApiStashEditTest.php

@@ -13,7 +13,7 @@ use Wikimedia\TestingAccessWrapper;
  * @group Database
  */
 class ApiStashEditTest extends ApiTestCase {
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setService( 'PageEditStash', new PageEditStash(
 			new HashBagOStuff( [] ),

tests/phpunit/includes/api/ApiUnblockTest.php

@@ -16,7 +16,7 @@ class ApiUnblockTest extends ApiTestCase {
 	/** @var User */
 	private $blockee;
 
-	public function setUp() : void {
+	protected 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() : void {
+	protected 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/block/BlockRestrictionStoreTest.php

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

tests/phpunit/includes/changes/CategoryMembershipChangeTest.php

@@ -48,7 +48,7 @@ class CategoryMembershipChangeTest extends MediaWikiLangTestCase {
 		return self::$mockRecentChange;
 	}
 
-	public function setUp() : void {
+	protected 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() : void {
+	protected function setUp() : void {
 		$this->group = $this->getGroup( [ 'name' => 'group' ] );
 
 		parent::setUp();

tests/phpunit/includes/changes/RecentChangeTest.php

@@ -13,7 +13,7 @@ class RecentChangeTest extends MediaWikiTestCase {
 	protected $user_comment;
 	protected $context;
 
-	public function setUp() : void {
+	protected 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() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'change_tag';

tests/phpunit/includes/collation/CustomUppercaseCollationTest.php

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

tests/phpunit/includes/debug/DeprecationHelperTest.php

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

tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php

@@ -9,7 +9,7 @@ use Psr\Log\NullLogger;
  */
 class ImportableOldRevisionImporterTest extends MediaWikiIntegrationTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'change_tag';

tests/phpunit/includes/jobqueue/JobRunnerTest.php

@@ -25,7 +25,7 @@ class JobRunnerTest extends MediaWikiIntegrationTestCase {
 	 */
 	private $deletePageJob;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$str = wfRandomString( 10 );

tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php

@@ -20,7 +20,7 @@ class CategoryMembershipChangeJobTest extends MediaWikiTestCase {
 	 */
 	private $title;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( 'wgRCWatchCategoryMembership', true );
 		$this->setContentLang( 'qqx' );

tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php

@@ -13,7 +13,7 @@ use MediaWiki\MediaWikiServices;
  */
 class ClearUserWatchlistJobTest extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		self::$users['ClearUserWatchlistJobTestUser']
 			= new TestUser( 'ClearUserWatchlistJobTestUser' );

tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php

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

tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php

@@ -10,7 +10,7 @@ class MimeAnalyzerTest extends PHPUnit\Framework\TestCase {
 	/** @var MimeAnalyzer */
 	private $mimeAnalyzer;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->mimeAnalyzer = new MimeAnalyzer( [
 			'infoFile' => MimeAnalyzer::USE_INTERNAL,
 			'typeFile' => MimeAnalyzer::USE_INTERNAL,

tests/phpunit/includes/libs/objectcache/BagOStuffTestBase.php

@@ -492,7 +492,7 @@ abstract class BagOStuffTestBase extends MediaWikiTestCase {
 		$this->assertTrue( $this->cache->unlock( $key2 ) );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		$this->cache->delete( $this->cache->makeKey( self::TEST_KEY ) );
 		$this->cache->delete( $this->cache->makeKey( self::TEST_KEY ) . ':lock' );
 

tests/phpunit/includes/linker/LinkRendererFactoryTest.php

@@ -37,7 +37,7 @@ class LinkRendererFactoryTest extends MediaWikiLangTestCase {
 	 */
 	private $hookContainer;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$services = MediaWikiServices::getInstance();

tests/phpunit/includes/linker/LinkRendererTest.php

@@ -14,7 +14,7 @@ class LinkRendererTest extends MediaWikiLangTestCase {
 	 */
 	private $factory;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgArticlePath' => '/wiki/$1',
@@ -195,7 +195,7 @@ class LinkRendererTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		Title::clearCaches();
 		parent::tearDown();
 	}

tests/phpunit/includes/logging/DatabaseLogEntryTest.php

@@ -4,7 +4,7 @@ use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IDatabase;
 
 class DatabaseLogEntryTest extends MediaWikiTestCase {
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// These services cache their joins
@@ -12,7 +12,7 @@ class DatabaseLogEntryTest extends MediaWikiTestCase {
 		MediaWikiServices::getInstance()->resetServiceForTesting( 'ActorMigration' );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		parent::tearDown();
 
 		MediaWikiServices::getInstance()->resetServiceForTesting( 'CommentStore' );

tests/phpunit/includes/media/WebPHandlerTest.php

@@ -4,13 +4,13 @@
  * @covers WebPHandler
  */
 class WebPHandlerTest extends MediaWikiTestCase {
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		// Allocated file for testing
 		$this->tempFileName = tempnam( wfTempDir(), 'WEBP' );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		parent::tearDown();
 		unlink( $this->tempFileName );
 	}

tests/phpunit/includes/page/ImagePage404Test.php

@@ -8,7 +8,7 @@ class ImagePage404Test extends MediaWikiMediaTestCase {
 		return parent::getRepoOptions() + [ 'transformVia404' => true ];
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->setMwGlobals( 'wgImageLimits', [
 			[ 320, 240 ],
 			[ 640, 480 ],

tests/phpunit/includes/page/ImagePageTest.php

@@ -4,7 +4,7 @@ use Wikimedia\TestingAccessWrapper;
 
 class ImagePageTest extends MediaWikiMediaTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->setMwGlobals( 'wgImageLimits', [
 			[ 320, 240 ],
 			[ 640, 480 ],

tests/phpunit/includes/parser/ParserOutputTest.php

@@ -33,7 +33,7 @@ class ParserOutputTest extends MediaWikiLangTestCase {
 		];
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		MWTimestamp::setFakeTime( false );
 
 		parent::tearDown();

tests/phpunit/includes/parser/StripStateTest.php

@@ -4,7 +4,7 @@
  * @covers StripState
  */
 class StripStateTest extends MediaWikiTestCase {
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setContentLang( 'qqx' );
 	}

tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php

@@ -38,7 +38,7 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
 	/** @var Config */
 	protected $config;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->context = new RequestContext();
 		$this->context->setTitle( Title::newFromText( self::class ) );

tests/phpunit/includes/registration/ExtensionProcessorTest.php

@@ -9,7 +9,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
 
 	private $dir, $dirname;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->dir = $this->getCurrentDir();
 		$this->dirname = dirname( $this->dir );

tests/phpunit/includes/registration/ExtensionRegistryTest.php

@@ -10,7 +10,7 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
 
 	private $dataDir;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->dataDir = __DIR__ . '/../../data/registration';
 	}

tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php

@@ -445,7 +445,7 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
 		);
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		Title::clearCaches();
 		parent::tearDown();
 	}

tests/phpunit/includes/search/SearchNearMatcherTest.php

@@ -142,7 +142,7 @@ class SearchNearMatcherTest extends MediaWikiIntegrationTestCase {
 		$this->assertSame( 0, $result->numRows() );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		Title::clearCaches();
 		parent::tearDown();
 	}

tests/phpunit/includes/specials/ContribsPagerTest.php

@@ -13,7 +13,7 @@ class ContribsPagerTest extends MediaWikiTestCase {
 	/** @var LinkRenderer */
 	private $linkRenderer;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
 		$context = new RequestContext();
 		$this->pager = new ContribsPager( $context, [

tests/phpunit/includes/specials/SpecialBlockTest.php

@@ -23,7 +23,7 @@ class SpecialBlockTest extends SpecialPageTestBase {
 		);
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		parent::tearDown();
 		$this->resetTables();
 	}

tests/phpunit/includes/specials/SpecialMIMESearchTest.php

@@ -9,7 +9,7 @@ class SpecialMIMESearchTest extends MediaWikiTestCase {
 	/** @var SpecialMIMESearch */
 	private $page;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->page = new SpecialMIMESearch;
 		$context = new RequestContext();
 		$context->setTitle( Title::makeTitle( NS_SPECIAL, 'MIMESearch' ) );

tests/phpunit/includes/specials/SpecialUnblockTest.php

@@ -16,7 +16,7 @@ class SpecialUnblockTest extends SpecialPageTestBase {
 		return new SpecialUnblock();
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		$this->db->delete( 'ipblocks', '*', __METHOD__ );
 	}
 

tests/phpunit/includes/specials/SpecialWatchlistTest.php

@@ -10,7 +10,7 @@ use Wikimedia\TestingAccessWrapper;
  * @covers SpecialWatchlist
  */
 class SpecialWatchlistTest extends SpecialPageTestBase {
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed = [ 'watchlist' ];
 		$this->setTemporaryHook(

tests/phpunit/includes/title/MediaWikiTitleCodecTest.php

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

tests/phpunit/includes/title/NamespaceInfoTest.php

@@ -19,7 +19,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 	 */
 	private $scopedCallback;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		// Boo, there's still some global state in the class :(
@@ -32,7 +32,7 @@ class NamespaceInfoTest extends MediaWikiTestCase {
 			ExtensionRegistry::getInstance()->setAttributeForTest( 'ExtensionNamespaces', [] );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		$this->scopedCallback = null;
 
 		parent::tearDown();

tests/phpunit/includes/user/TalkPageNotificationManagerTest.php

@@ -14,7 +14,7 @@ use PHPUnit\Framework\AssertionFailedError;
 class TalkPageNotificationManagerTest extends MediaWikiIntegrationTestCase {
 	use MediaWikiCoversValidator;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->tablesUsed[] = 'user_newtalk';
 	}

tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php

@@ -9,7 +9,7 @@ use MediaWiki\MediaWikiServices;
  */
 class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCase {
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		self::$users[ 'WatchedItemQueryServiceIntegrationTestUser' ]
 			= new TestUser( 'WatchedItemQueryServiceIntegrationTestUser' );

tests/phpunit/includes/watcheditem/WatchedItemStoreIntegrationTest.php

@@ -12,7 +12,7 @@ use Wikimedia\TestingAccessWrapper;
  */
 class WatchedItemStoreIntegrationTest extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		self::$users['WatchedItemStoreIntegrationTestUser']
 			= new TestUser( 'WatchedItemStoreIntegrationTestUser' );

tests/phpunit/integration/includes/revisionlist/RevisionListTest.php

@@ -15,7 +15,7 @@ use Wikimedia\Rdbms\IDatabase;
  */
 class RevisionListTest extends MediaWikiIntegrationTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->tablesUsed[] = 'revision';

tests/phpunit/languages/LanguageConverterIntegrationTest.php

@@ -22,7 +22,7 @@ class LanguageConverterIntegrationTest extends MediaWikiTestCase {
 		return $this->factory->getLanguageConverter( $language );
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->factory = new LanguageConverterFactory( false, function () {
 			$language = MediaWikiServices::getInstance()->getContentLanguage();
 		} );

tests/phpunit/languages/LanguageIntegrationTest.php

@@ -27,7 +27,7 @@ class LanguageIntegrationTest extends LanguageClassesTestCase {
 		);
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		global $wgHooks;
 
 		parent::setUp();

tests/phpunit/maintenance/backup_PageTest.php

@@ -32,7 +32,7 @@ class BackupDumperPageTest extends DumpTestCase {
 		$this->addTestPages();
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		parent::tearDown();
 
 		if ( isset( $this->streamingLoadBalancer ) ) {

tests/phpunit/maintenance/categoryChangesAsRdfTest.php

@@ -8,7 +8,7 @@ use Wikimedia\Rdbms\IDatabase;
  */
 class CategoryChangesAsRdfTest extends MediaWikiLangTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->setMwGlobals( [
 			'wgServer' => 'http://acme.test',

tests/phpunit/maintenance/deleteAutoPatrolLogsTest.php

@@ -14,7 +14,7 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 		return DeleteAutoPatrolLogs::class;
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->tablesUsed = [ 'logging' ];
 

tests/phpunit/structure/ExtensionJsonValidationTest.php

@@ -29,7 +29,7 @@ class ExtensionJsonValidationTest extends PHPUnit\Framework\TestCase {
 	 */
 	protected $validator;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->validator = new ExtensionJsonValidator( [ $this, 'markTestSkipped' ] );

tests/phpunit/structure/SpecialPageFatalTest.php

@@ -14,7 +14,7 @@ use MediaWiki\MediaWikiServices;
  */
 class SpecialPageFatalTest extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		// FIXME: Acknowledge known non-fatal query (T248191)
 		$this->setMwGlobals( 'wgDBerrorLog', false );

tests/phpunit/suites/ParserIntegrationTest.php

@@ -65,12 +65,12 @@ class ParserIntegrationTest extends PHPUnit\Framework\TestCase {
 		$this->assertEquals( $result->expected, $result->actual );
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->ptTeardownScope = $this->ptRunner->staticSetup();
 		$this->hideDeprecated( 'Hooks::clear' );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		if ( $this->ptTeardownScope ) {
 			ScopedCallback::consume( $this->ptTeardownScope );
 		}

tests/phpunit/suites/ParserTestFileSuite.php

@@ -31,7 +31,7 @@ class ParserTestFileSuite extends TestSuite {
 		}
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		$this->ptRunner->addArticles( $this->ptFileInfo[ 'articles'] );
 	}
 }

tests/phpunit/suites/ParserTestTopLevelSuite.php

@@ -138,7 +138,7 @@ class ParserTestTopLevelSuite extends TestSuite {
 		}
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		wfDebug( __METHOD__ );
 
 		$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
@@ -162,7 +162,7 @@ class ParserTestTopLevelSuite extends TestSuite {
 		$this->ptTeardownScope = $teardown;
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		wfDebug( __METHOD__ );
 		if ( $this->ptTeardownScope ) {
 			ScopedCallback::consume( $this->ptTeardownScope );

tests/phpunit/tests/MediaWikiTestCaseSchema1Test.php

@@ -12,7 +12,7 @@ class MediaWikiTestCaseSchema1Test extends MediaWikiTestCase {
 
 	public static $hasRun = false;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		// FIXME: fails under postgres
 		$this->markTestSkippedIfDbType( 'postgres' );

tests/phpunit/tests/MediaWikiTestCaseSchema2Test.php

@@ -14,7 +14,7 @@
  */
 class MediaWikiTestCaseSchema2Test extends MediaWikiTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		// FIXME: fails under postgres
 		$this->markTestSkippedIfDbType( 'postgres' );

tests/phpunit/unit/includes/BadFileLookupTest.php

@@ -113,7 +113,7 @@ WIKITEXT;
 		return MediaWikiServices::getInstance()->getHookContainer();
 	}
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 
 		$this->setTemporaryHook( 'BadImage', __CLASS__ . '::badImageHook' );

tests/phpunit/unit/includes/exception/MWExceptionHandlerTest.php

@@ -10,14 +10,14 @@ class MWExceptionHandlerTest extends \MediaWikiUnitTestCase {
 
 	private $oldSettingValue;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		// We need to make sure the traces have function arguments as we're testing
 		// their handling.
 		$this->oldSettingValue = ini_set( 'zend.exception_ignore_args', 0 );
 	}
 
-	public function tearDown() : void {
+	protected function tearDown() : void {
 		ini_set( 'zend.exception_ignore_args', $this->oldSettingValue );
 		parent::tearDown();
 	}

tests/phpunit/unit/includes/libs/composer/ComposerInstalledTest.php

@@ -4,7 +4,7 @@ class ComposerInstalledTest extends PHPUnit\Framework\TestCase {
 
 	private $installed;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->installed = __DIR__ . "/../../../../data/composer/installed.json";
 	}

tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php

@@ -4,7 +4,7 @@ class ComposerJsonTest extends PHPUnit\Framework\TestCase {
 
 	private $json, $json2;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->json = __DIR__ . "/../../../../data/composer/composer.json";
 		$this->json2 = __DIR__ . "/../../../../data/composer/new-composer.json";

tests/phpunit/unit/includes/libs/composer/ComposerLockTest.php

@@ -4,7 +4,7 @@ class ComposerLockTest extends PHPUnit\Framework\TestCase {
 
 	private $lock;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->lock = __DIR__ . "/../../../../data/composer/composer.lock";
 	}

tests/phpunit/unit/includes/objectcache/RESTBagOStuffTest.php

@@ -15,7 +15,7 @@ class RESTBagOStuffTest extends \MediaWikiUnitTestCase {
 	 */
 	private $bag;
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		$this->client =
 			$this->getMockBuilder( MultiHttpClient::class )

tests/phpunit/unit/includes/password/Argon2PasswordTest.php

@@ -10,7 +10,7 @@
  */
 class Argon2PasswordTest extends PasswordTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		parent::setUp();
 		if ( !defined( 'PASSWORD_ARGON2I' ) ) {
 			$this->markTestSkipped( 'Argon2 support not found' );

tests/phpunit/unit/includes/utils/AvroValidatorTest.php

@@ -14,7 +14,7 @@
  */
 class AvroValidatorTest extends MediaWikiUnitTestCase {
 
-	public function setUp() : void {
+	protected function setUp() : void {
 		if ( !class_exists( 'AvroSchema' ) ) {
 			$this->markTestSkipped( 'Avro is required to run the AvroValidatorTest' );
 		}