aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/phpunit/includes/RevisionStorageTest.php2
-rw-r--r--tests/phpunit/includes/SpecialPageTest.php2
-rw-r--r--tests/phpunit/includes/TitleMethodsTest.php4
-rw-r--r--tests/phpunit/includes/api/ApiEditPageTest.php4
-rw-r--r--tests/phpunit/includes/content/ContentHandlerTest.php4
-rw-r--r--tests/phpunit/includes/content/WikitextContentHandlerTest.php2
-rw-r--r--tests/phpunit/includes/diff/DifferenceEngineTest.php2
-rw-r--r--tests/phpunit/includes/parser/TidyTest.php3
8 files changed, 12 insertions, 11 deletions
diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php
index 90ef55379579..7e275a5891a8 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -56,7 +56,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
}
}
- public function tearDown() {
+ protected function tearDown() {
global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
parent::tearDown();
diff --git a/tests/phpunit/includes/SpecialPageTest.php b/tests/phpunit/includes/SpecialPageTest.php
index a29d527dd9b3..65057a57026a 100644
--- a/tests/phpunit/includes/SpecialPageTest.php
+++ b/tests/phpunit/includes/SpecialPageTest.php
@@ -10,7 +10,7 @@
*/
class SpecialPageTest extends MediaWikiTestCase {
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->setMwGlobals( array(
diff --git a/tests/phpunit/includes/TitleMethodsTest.php b/tests/phpunit/includes/TitleMethodsTest.php
index 3079d73a3788..55a17ac3ddf6 100644
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -9,7 +9,7 @@
*/
class TitleMethodsTest extends MediaWikiTestCase {
- public function setUp() {
+ protected function setUp() {
global $wgContLang;
parent::setUp();
@@ -33,7 +33,7 @@ class TitleMethodsTest extends MediaWikiTestCase {
$wgContLang->resetNamespaces(); # reset namespace cache
}
- public function tearDown() {
+ protected function tearDown() {
global $wgContLang;
parent::tearDown();
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 8fe08e10b651..2709d52d19c7 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -13,7 +13,7 @@
*/
class ApiEditPageTest extends ApiTestCase {
- public function setUp() {
+ protected function setUp() {
global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
parent::setUp();
@@ -30,7 +30,7 @@ class ApiEditPageTest extends ApiTestCase {
$this->doLogin();
}
- public function tearDown() {
+ protected function tearDown() {
global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
unset( $wgExtraNamespaces[12312] );
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
index aedf594d26ab..d1c214aeacba 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -10,7 +10,7 @@
*/
class ContentHandlerTest extends MediaWikiTestCase {
- public function setUp() {
+ protected function setUp() {
global $wgContLang;
parent::setUp();
@@ -38,7 +38,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
$wgContLang->resetNamespaces();
}
- public function tearDown() {
+ protected function tearDown() {
global $wgContLang;
// Reset namespace cache
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index 7c62dcad24a9..73b975baa888 100644
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -10,7 +10,7 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
*/
var $handler;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$this->handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index 5c3f36a62718..f95eb5e8f639 100644
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -16,7 +16,7 @@ class DifferenceEngineTest extends MediaWikiTestCase {
private static $revisions;
- public function setUp() {
+ protected function setUp() {
parent::setUp();
$title = $this->getTitle();
diff --git a/tests/phpunit/includes/parser/TidyTest.php b/tests/phpunit/includes/parser/TidyTest.php
index d2ab4d3e13bf..12aac6916c07 100644
--- a/tests/phpunit/includes/parser/TidyTest.php
+++ b/tests/phpunit/includes/parser/TidyTest.php
@@ -4,7 +4,8 @@
* @group Parser
*/
class TidyTest extends MediaWikiTestCase {
- public function setUp() {
+
+ protected function setUp() {
parent::setUp();
$check = MWTidy::tidy( '' );
if ( strpos( $check, '<!--' ) !== false ) {