From f41907523c27a3bb3a9f7d887c2b351549a289fe Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 16 Oct 2010 15:07:55 +0000
Subject: [PATCH] Renamed all setup() in tests to setUp(). Although PHP doesn't
 care, PHPUnit docs prefer the latter. Removed a pointless override in one
 case.

---
 maintenance/tests/phpunit/includes/CdbTest.php                | 2 +-
 maintenance/tests/phpunit/includes/HttpTest.php               | 2 +-
 maintenance/tests/phpunit/includes/UploadFromUrlTest.php      | 2 +-
 maintenance/tests/phpunit/includes/UploadTest.php             | 2 +-
 maintenance/tests/phpunit/includes/api/ApiTest.php            | 4 ----
 maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php  | 4 ++--
 .../tests/phpunit/includes/search/SearchEngineTest.php        | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/maintenance/tests/phpunit/includes/CdbTest.php b/maintenance/tests/phpunit/includes/CdbTest.php
index 8b7afd56ae..987a0f5be7 100644
--- a/maintenance/tests/phpunit/includes/CdbTest.php
+++ b/maintenance/tests/phpunit/includes/CdbTest.php
@@ -6,7 +6,7 @@
 
 class CdbTest extends PHPUnit_Framework_TestCase {
 
-	public function setup() {
+	public function setUp() {
 		if ( !CdbReader::haveExtension() ) {
 			$this->markTestIncomplete( 'This test requires native CDB support to be present.' );
 		}
diff --git a/maintenance/tests/phpunit/includes/HttpTest.php b/maintenance/tests/phpunit/includes/HttpTest.php
index 8491b94024..994a4890d7 100644
--- a/maintenance/tests/phpunit/includes/HttpTest.php
+++ b/maintenance/tests/phpunit/includes/HttpTest.php
@@ -27,7 +27,7 @@ class HttpTest extends PHPUnit_Framework_TestCase {
 
 	var $test_posturl = array( "http://www.comp.leeds.ac.uk/cgi-bin/Perl/environment-example" => "review=test" );
 
-	function setup() {
+	function setUp() {
 		putenv( "http_proxy" ); /* Remove any proxy env var, so curl doesn't get confused */
 		if ( is_array( self::$content ) ) {
 			return;
diff --git a/maintenance/tests/phpunit/includes/UploadFromUrlTest.php b/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
index bf99f38aa4..32678d6b11 100644
--- a/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
+++ b/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
@@ -9,7 +9,7 @@ class UploadFromUrlTest extends ApiTestSetup {
 
 	public function setUp() {
 		global $wgEnableUploads, $wgAllowCopyUploads, $wgAllowAsyncCopyUploads;
-		parent::setup();
+		parent::setUp();
 
 		$wgEnableUploads = true;
 		$wgAllowCopyUploads = true;
diff --git a/maintenance/tests/phpunit/includes/UploadTest.php b/maintenance/tests/phpunit/includes/UploadTest.php
index 41c9d80d56..cf8e4d3cc7 100644
--- a/maintenance/tests/phpunit/includes/UploadTest.php
+++ b/maintenance/tests/phpunit/includes/UploadTest.php
@@ -8,7 +8,7 @@ class UploadTest extends PHPUnit_Framework_TestCase {
 
 	function setUp() {
 		global $wgContLang;
-		parent::setup();
+		parent::setUp();
 		$wgContLang = Language::factory( 'en' );
 		$this->upload = new UploadTestHandler;
 	}
diff --git a/maintenance/tests/phpunit/includes/api/ApiTest.php b/maintenance/tests/phpunit/includes/api/ApiTest.php
index 47b9005711..1f87602cc5 100644
--- a/maintenance/tests/phpunit/includes/api/ApiTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiTest.php
@@ -19,10 +19,6 @@ class MockApi extends ApiBase {
 
 class ApiTest extends ApiTestSetup {
 
-	function setup() {
-		parent::setup();
-	}
-
 	function testRequireOnlyOneParameterDefault() {
 		$mock = new MockApi();
 
diff --git a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 252a3ac77e..24f0ea7c5f 100644
--- a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -23,7 +23,7 @@ class MockDatabaseSqlite extends DatabaseSqliteStandalone {
 class DatabaseSqliteTest extends PHPUnit_Framework_TestCase {
 	var $db;
 
-	public function setup() {
+	public function setUp() {
 		if ( !Sqlite::isPresent() ) {
 			$this->markTestSkipped( 'No SQLite support detected' );
 		}
@@ -84,4 +84,4 @@ class DatabaseSqliteTest extends PHPUnit_Framework_TestCase {
 			$this->fail( $result );
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/maintenance/tests/phpunit/includes/search/SearchEngineTest.php b/maintenance/tests/phpunit/includes/search/SearchEngineTest.php
index 024b440c44..88a3787aea 100644
--- a/maintenance/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/maintenance/tests/phpunit/includes/search/SearchEngineTest.php
@@ -13,7 +13,7 @@ class SearchEngineTest extends MediaWikiTestSetup {
 	 * Checks for database type & version.
 	 * Will skip current test if DB does not support search.
 	 */
-	function setup() {
+	function setUp() {
 		// Search tests require MySQL or SQLite with FTS
 		# Get database type and version
 		$dbType    = $this->db->getType();
-- 
2.20.1