jenkins-bot has submitted this change and it was merged.
Change subject: Fix visibility of setUp/tearDown
......................................................................
Fix visibility of setUp/tearDown
Change-Id: Idf44d31cf686ffbf67e0cd304ed4bcdd1c5af9bd
---
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
M client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
M client/tests/phpunit/includes/api/ApiClientInfoTest.php
M client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
M client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/changes/ChangeRowTest.php
M lib/tests/phpunit/specials/SpecialPageTestBase.php
M lib/tests/phpunit/store/PropertyInfoTableTest.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
M repo/tests/phpunit/includes/ItemMoveTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
M repo/tests/phpunit/includes/actions/ActionTestCase.php
M repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
M repo/tests/phpunit/includes/api/AvailableBadgesTest.php
M repo/tests/phpunit/includes/api/BotEditTest.php
M repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
M repo/tests/phpunit/includes/api/IntegrationApiTest.php
M repo/tests/phpunit/includes/api/LinkTitlesTest.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
M repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/api/ParseValueTest.php
M repo/tests/phpunit/includes/api/PermissionsTestCase.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
M repo/tests/phpunit/includes/api/SetAliasesTest.php
M repo/tests/phpunit/includes/api/SetClaimValueTest.php
M repo/tests/phpunit/includes/api/SetDescriptionTest.php
M repo/tests/phpunit/includes/api/SetLabelTest.php
M repo/tests/phpunit/includes/api/SetQualifierTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
M repo/tests/phpunit/includes/specials/SpecialItemsWithoutSitelinksTest.php
M repo/tests/phpunit/includes/specials/SpecialListDatatypesTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
M repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
45 files changed, 51 insertions(+), 51 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index ca77828..3e63369 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -47,7 +47,7 @@
/** @var Site $site */
protected $site;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->site = new \MediaWikiSite();
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 2550958..7d7135b 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -60,7 +60,7 @@
return $items;
}
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->langLinkHandler = $this->getLangLinkHandler( array() );
diff --git a/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
b/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
index 1bc0cf8..f332d6b 100644
--- a/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
@@ -37,7 +37,7 @@
*/
private $lookupTester;
- public function setUp() {
+ protected function setUp() {
if (
WikibaseClient::getDefaultInstance()->getSettings()->getSetting(
'useLegacyUsageIndex' ) ) {
$this->markTestSkipped( 'Skipping test for
SqlUsageTracker, because the useLegacyUsageIndex option is set.' );
}
diff --git a/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
b/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
index 5d6d3f4..68047d1 100644
--- a/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php
@@ -25,7 +25,7 @@
private $tableName = 'wbc_entity_usage';
- public function setUp() {
+ protected function setUp() {
if (
WikibaseClient::getDefaultInstance()->getSettings()->getSetting(
'useLegacyUsageIndex' ) ) {
$this->markTestSkipped( 'Skipping test for
SqlUsageTracker, because the useLegacyUsageIndex option is set.' );
}
diff --git a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
index f13b4fc..2897ee0 100644
--- a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
+++ b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
@@ -30,7 +30,7 @@
*/
protected $apiContext;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->apiContext = new \ApiTestContext();
diff --git
a/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
b/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
index f9fbef6..8cc639f 100644
--- a/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
+++ b/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
@@ -27,7 +27,7 @@
protected $repoLinker;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
// these are required because Linker is used in
ChangeLineFormatter
diff --git
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
index f4cc221..142a23c 100644
---
a/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
+++
b/client/tests/phpunit/includes/recentchanges/RecentChangesFilterOptionsTest.php
@@ -17,7 +17,7 @@
* @author Marius Hoch < [email protected] >
*/
class RecentChangesFilterOptionsTest extends \MediaWikiTestCase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$user = User::newFromName( 'RecentChangesFilterOptionsTest' );
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index 568eec5..d19d0c9 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -27,7 +27,7 @@
/* @var MockRepository */
protected $repo;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->repo = new MockRepository();
}
diff --git a/lib/tests/phpunit/changes/ChangeRowTest.php
b/lib/tests/phpunit/changes/ChangeRowTest.php
index 9e1442e..f6a6867 100644
--- a/lib/tests/phpunit/changes/ChangeRowTest.php
+++ b/lib/tests/phpunit/changes/ChangeRowTest.php
@@ -60,7 +60,7 @@
);
}
- public function setUp() {
+ protected function setUp() {
if ( !defined( 'WB_VERSION' ) ) {
//TODO: remove this once ChangeRow no longer needs the
ChangesTable as a factory.
$this->markTestSkipped( "Skipping because cannot test
changes table on client" );
diff --git a/lib/tests/phpunit/specials/SpecialPageTestBase.php
b/lib/tests/phpunit/specials/SpecialPageTestBase.php
index 1b26039..c1cd7e0 100644
--- a/lib/tests/phpunit/specials/SpecialPageTestBase.php
+++ b/lib/tests/phpunit/specials/SpecialPageTestBase.php
@@ -25,13 +25,13 @@
protected $obLevel;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->obLevel = ob_get_level();
}
- public function tearDown() {
+ protected function tearDown() {
$obLevel = ob_get_level();
while ( ob_get_level() > $this->obLevel ) {
diff --git a/lib/tests/phpunit/store/PropertyInfoTableTest.php
b/lib/tests/phpunit/store/PropertyInfoTableTest.php
index 6339ae7..4662873 100644
--- a/lib/tests/phpunit/store/PropertyInfoTableTest.php
+++ b/lib/tests/phpunit/store/PropertyInfoTableTest.php
@@ -31,7 +31,7 @@
$this->helper = new PropertyInfoStoreTestHelper( $this, array(
$this, 'newPropertyInfoTable' ) );
}
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if ( !defined( 'WB_VERSION' ) ) {
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index 51eb346..2d25b14 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -27,7 +27,7 @@
*/
protected $siteLinkTable;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if ( !defined( 'WB_VERSION' ) ) {
diff --git a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
b/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
index 1961cb9..b8591d6 100644
--- a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
+++ b/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
@@ -28,7 +28,7 @@
parent::__construct( $name, $data, $dataName );
}
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if ( !defined( 'WB_VERSION' ) ) {
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index 533ecfd..b680cd1 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -40,7 +40,7 @@
*/
public $serializationOptions = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->serializerFactory = new SerializerFactory();
diff --git
a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index fee157c..2e07bcb 100644
--- a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -39,7 +39,7 @@
*/
private $testHelper = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->testHelper = new EntityModificationTestHelper();
diff --git
a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
index e8e88fe..491fda2 100644
--- a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
@@ -34,7 +34,7 @@
*/
private $repo = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->repo = new MockRepository();
diff --git a/repo/tests/phpunit/includes/ItemMoveTest.php
b/repo/tests/phpunit/includes/ItemMoveTest.php
index 335806a..b34d958 100644
--- a/repo/tests/phpunit/includes/ItemMoveTest.php
+++ b/repo/tests/phpunit/includes/ItemMoveTest.php
@@ -45,7 +45,7 @@
/**
* This is to set up the environment
*/
- public function setUp() {
+ protected function setUp() {
parent::setUp();
//TODO: remove global TestSites DB setup once we can inject
sites sanely.
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index fdbe874..15f976b 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -42,7 +42,7 @@
*/
private $obLevel;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->interfaceTitle = Title::newFromText(
"Special:EntityDataRequestHandlerTest" );
@@ -50,7 +50,7 @@
$this->obLevel = ob_get_level();
}
- public function tearDown() {
+ protected function tearDown() {
$obLevel = ob_get_level();
while ( ob_get_level() > $this->obLevel ) {
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
index 9e7629b..9725cd0 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataUriManagerTest.php
@@ -28,7 +28,7 @@
*/
private $idParser;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->idParser = new BasicEntityIdParser();
diff --git a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
index af439fd..cbf0dc0 100644
--- a/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
@@ -44,7 +44,7 @@
*/
protected $propertyDataTypeLookup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$numericValidator = new TestValidator( '/^[0-9]+$/' );
diff --git a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
index 45c498f..822ccae 100644
--- a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
+++ b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
@@ -34,12 +34,12 @@
)
);
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->switchSettings();
}
- public function tearDown() {
+ protected function tearDown() {
parent::tearDown();
$this->switchSettings();
}
diff --git a/repo/tests/phpunit/includes/actions/ActionTestCase.php
b/repo/tests/phpunit/includes/actions/ActionTestCase.php
index 89bbc63..18c691d 100644
--- a/repo/tests/phpunit/includes/actions/ActionTestCase.php
+++ b/repo/tests/phpunit/includes/actions/ActionTestCase.php
@@ -42,7 +42,7 @@
*/
protected $languageCode = 'qqx';
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$testUser = new \TestUser( 'ActionTestUser' );
@@ -59,7 +59,7 @@
ApiQueryInfo::resetTokenCache();
}
- public function tearDown() {
+ protected function tearDown() {
ApiQueryInfo::resetTokenCache();
parent::tearDown();
}
diff --git a/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
b/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
index 4a0d4b6..ac5174c 100644
--- a/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
+++ b/repo/tests/phpunit/includes/actions/ViewEntityActionTest.php
@@ -22,7 +22,7 @@
*/
class ViewEntityActionTest extends ActionTestCase {
- public function setUp() {
+ protected function setUp() {
// NOTE: use a language here for which we actually have labels
etc
$this->languageCode = 'de';
diff --git a/repo/tests/phpunit/includes/api/AvailableBadgesTest.php
b/repo/tests/phpunit/includes/api/AvailableBadgesTest.php
index bc54117..efa91b4 100644
--- a/repo/tests/phpunit/includes/api/AvailableBadgesTest.php
+++ b/repo/tests/phpunit/includes/api/AvailableBadgesTest.php
@@ -28,14 +28,14 @@
static $oldBadgeItems;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
// Allow some badges for testing
self::$oldBadgeItems =
WikibaseRepo::getDefaultInstance()->getSettings()->getSetting( 'badgeItems' );
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting(
'badgeItems', self::$badgeItems );
}
- public function tearDown() {
+ protected function tearDown() {
parent::tearDown();
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting(
'badgeItems', self::$oldBadgeItems );
}
diff --git a/repo/tests/phpunit/includes/api/BotEditTest.php
b/repo/tests/phpunit/includes/api/BotEditTest.php
index ae2f46c..6115426 100644
--- a/repo/tests/phpunit/includes/api/BotEditTest.php
+++ b/repo/tests/phpunit/includes/api/BotEditTest.php
@@ -38,7 +38,7 @@
*/
private static $wbBotUser;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if ( !isset( self::$wbBotUser ) ) {
diff --git a/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
b/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
index d6095be..43e3500 100644
--- a/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
+++ b/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
@@ -39,7 +39,7 @@
*/
private $repo = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->repo = new MockRepository();
diff --git a/repo/tests/phpunit/includes/api/IntegrationApiTest.php
b/repo/tests/phpunit/includes/api/IntegrationApiTest.php
index 4f6e25d..34e8661 100644
--- a/repo/tests/phpunit/includes/api/IntegrationApiTest.php
+++ b/repo/tests/phpunit/includes/api/IntegrationApiTest.php
@@ -21,7 +21,7 @@
*/
class IntegrationApiTest extends ApiTestCase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$sitesTable =
WikibaseRepo::getDefaultInstance()->getSiteStore();
$sitesTable->clear();
diff --git a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
index 4a126fc..1963100 100644
--- a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
+++ b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
@@ -23,7 +23,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if( !isset( self::$hasSetup ) ){
diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 3890f3e..7c00886 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -43,7 +43,7 @@
*/
private $apiModuleTestHelper = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->entityModificationTestHelper = new
EntityModificationTestHelper();
diff --git a/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
b/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
index 26d4098..c20fd54 100644
--- a/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
+++ b/repo/tests/phpunit/includes/api/ModifyTermTestCase.php
@@ -14,7 +14,7 @@
protected static $testId;
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if( !isset( self::$hasSetup ) ){
diff --git a/repo/tests/phpunit/includes/api/ParseValueTest.php
b/repo/tests/phpunit/includes/api/ParseValueTest.php
index dd408e3..4e67dab 100644
--- a/repo/tests/phpunit/includes/api/ParseValueTest.php
+++ b/repo/tests/phpunit/includes/api/ParseValueTest.php
@@ -18,7 +18,7 @@
*/
class ParseValueTest extends WikibaseApiTestCase {
- public function setUp() {
+ protected function setUp() {
$this->mergeMwGlobalArrayValue(
'wgValueParsers',
array( 'decimal' => 'ValueParsers\DecimalParser' )
diff --git a/repo/tests/phpunit/includes/api/PermissionsTestCase.php
b/repo/tests/phpunit/includes/api/PermissionsTestCase.php
index b8ba9fb..a63b21e 100644
--- a/repo/tests/phpunit/includes/api/PermissionsTestCase.php
+++ b/repo/tests/phpunit/includes/api/PermissionsTestCase.php
@@ -19,7 +19,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
global $wgGroupPermissions, $wgUser;
parent::setUp();
diff --git a/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
b/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
index b98c358..46811de 100644
--- a/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
+++ b/repo/tests/phpunit/includes/api/SearchEntitiesTest.php
@@ -20,7 +20,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if( !isset( self::$hasSetup ) ) {
diff --git a/repo/tests/phpunit/includes/api/SetAliasesTest.php
b/repo/tests/phpunit/includes/api/SetAliasesTest.php
index 7e1289e..03a6b2a 100644
--- a/repo/tests/phpunit/includes/api/SetAliasesTest.php
+++ b/repo/tests/phpunit/includes/api/SetAliasesTest.php
@@ -22,7 +22,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
self::$testAction = 'wbsetaliases';
parent::setUp();
diff --git a/repo/tests/phpunit/includes/api/SetClaimValueTest.php
b/repo/tests/phpunit/includes/api/SetClaimValueTest.php
index d5b7b26..ffa5388 100644
--- a/repo/tests/phpunit/includes/api/SetClaimValueTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimValueTest.php
@@ -54,7 +54,7 @@
*/
private $propertyValueFormatter = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
static $hasEntities = false;
diff --git a/repo/tests/phpunit/includes/api/SetDescriptionTest.php
b/repo/tests/phpunit/includes/api/SetDescriptionTest.php
index cc978c6..817c879 100644
--- a/repo/tests/phpunit/includes/api/SetDescriptionTest.php
+++ b/repo/tests/phpunit/includes/api/SetDescriptionTest.php
@@ -23,7 +23,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
self::$testAction = 'wbsetdescription';
diff --git a/repo/tests/phpunit/includes/api/SetLabelTest.php
b/repo/tests/phpunit/includes/api/SetLabelTest.php
index ef67691..c7a118f 100644
--- a/repo/tests/phpunit/includes/api/SetLabelTest.php
+++ b/repo/tests/phpunit/includes/api/SetLabelTest.php
@@ -23,7 +23,7 @@
private static $hasSetup;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
self::$testAction = 'wbsetlabel';
diff --git a/repo/tests/phpunit/includes/api/SetQualifierTest.php
b/repo/tests/phpunit/includes/api/SetQualifierTest.php
index 4f939e1..3b5840c 100644
--- a/repo/tests/phpunit/includes/api/SetQualifierTest.php
+++ b/repo/tests/phpunit/includes/api/SetQualifierTest.php
@@ -36,7 +36,7 @@
*/
class SetQualifierTest extends WikibaseApiTestCase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
static $hasEntities = false;
diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
b/repo/tests/phpunit/includes/content/ItemContentTest.php
index af75d1c..7437fc1 100644
--- a/repo/tests/phpunit/includes/content/ItemContentTest.php
+++ b/repo/tests/phpunit/includes/content/ItemContentTest.php
@@ -40,7 +40,7 @@
*/
class ItemContentTest extends EntityContentTest {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
}
diff --git
a/repo/tests/phpunit/includes/specials/SpecialItemsWithoutSitelinksTest.php
b/repo/tests/phpunit/includes/specials/SpecialItemsWithoutSitelinksTest.php
index 2701fef..599c478 100644
--- a/repo/tests/phpunit/includes/specials/SpecialItemsWithoutSitelinksTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialItemsWithoutSitelinksTest.php
@@ -21,7 +21,7 @@
*/
class SpecialItemsWithoutSitelinksTest extends SpecialPageTestBase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->setMwGlobals( array(
diff --git a/repo/tests/phpunit/includes/specials/SpecialListDatatypesTest.php
b/repo/tests/phpunit/includes/specials/SpecialListDatatypesTest.php
index 1f44458..cb869f2 100644
--- a/repo/tests/phpunit/includes/specials/SpecialListDatatypesTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialListDatatypesTest.php
@@ -18,7 +18,7 @@
*/
class SpecialListDataTypesTest extends SpecialPageTestBase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->setMwGlobals( array(
diff --git a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index 568c6df..7d9ca4e 100644
--- a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -47,7 +47,7 @@
*/
private $entityModificationTestHelper = null;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->entityModificationTestHelper = new
EntityModificationTestHelper();
diff --git a/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
b/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
index 54ebc88..d66cd0b 100644
--- a/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
@@ -85,7 +85,7 @@
return new SpecialSetSiteLink();
}
- public function setUp() {
+ protected function setUp() {
parent::setUp();
if ( !self::$badgeId ) {
@@ -101,7 +101,7 @@
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting(
'badgeItems', array( self::$badgeId => '' ) );
}
- public function tearDown() {
+ protected function tearDown() {
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting(
'badgeItems', self::$oldBadgeItemsSetting );
parent::tearDown();
}
diff --git a/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
b/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
index 3c2e3fc..183e516 100644
--- a/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
+++ b/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
@@ -42,7 +42,7 @@
*/
protected $wikibaseRepo;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->wikibaseRepo = WikibaseRepo::getDefaultInstance();
diff --git a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
index bcd424c..35e0bce 100644
--- a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
+++ b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
@@ -27,7 +27,7 @@
*/
class TermSqlIndexTest extends TermIndexTest {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->tablesUsed[] = 'wb_terms';
--
To view, visit https://gerrit.wikimedia.org/r/172679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf44d31cf686ffbf67e0cd304ed4bcdd1c5af9bd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
