| Index: trunk/phase3/tests/phpunit/MediaWikiTestCase.php |
| — | — | @@ -231,9 +231,5 @@ |
| 232 | 232 | MediaWikiPHPUnitCommand::$additionalOptions[$offset] = $value; |
| 233 | 233 | |
| 234 | 234 | } |
| 235 | | - |
| 236 | | - public static function disableInterwikis( $prefix, &$data ) { |
| 237 | | - return false; |
| 238 | | - } |
| 239 | 235 | } |
| 240 | 236 | |
| Index: trunk/phase3/tests/phpunit/includes/UploadTest.php |
| — | — | @@ -7,18 +7,12 @@ |
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 | function setUp() { |
| 11 | | - global $wgHooks; |
| | 11 | + global $wgContLang; |
| 12 | 12 | parent::setUp(); |
| 13 | | - |
| | 13 | + $wgContLang = Language::factory( 'en' ); |
| 14 | 14 | $this->upload = new UploadTestHandler; |
| 15 | | - $this->hooks = $wgHooks; |
| 16 | | - $wgHooks['InterwikiLoadPrefix'][] = 'MediaWikiTestCase::disableInterwikis'; |
| 17 | 15 | } |
| 18 | 16 | |
| 19 | | - function tearDown() { |
| 20 | | - $wgHooks = $this->hooks; |
| 21 | | - } |
| 22 | | - |
| 23 | 17 | /** |
| 24 | 18 | * Test various forms of valid and invalid titles that can be supplied. |
| 25 | 19 | */ |
| Index: trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | /** |
| 5 | 5 | * @group Database |
| 6 | 6 | */ |
| 7 | | -class TitlePermissionTest extends MediaWikiLangTestCase { |
| | 7 | +class TitlePermissionTest extends MediaWikiTestCase { |
| 8 | 8 | protected $title; |
| 9 | 9 | protected $user; |
| 10 | 10 | protected $anonUser; |
| — | — | @@ -14,7 +14,6 @@ |
| 15 | 15 | |
| 16 | 16 | function setUp() { |
| 17 | 17 | global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc, $wgContLang, $wgLang; |
| 18 | | - parent::setUp(); |
| 19 | 18 | |
| 20 | 19 | if(!$wgMemc) { |
| 21 | 20 | $wgMemc = new EmptyBagOStuff; |
| — | — | @@ -51,10 +50,6 @@ |
| 52 | 51 | } |
| 53 | 52 | } |
| 54 | 53 | |
| 55 | | - function tearDown() { |
| 56 | | - parent::tearDown(); |
| 57 | | - } |
| 58 | | - |
| 59 | 54 | function setUserPerm( $perm ) { |
| 60 | 55 | if ( is_array( $perm ) ) { |
| 61 | 56 | $this->user->mRights = $perm; |
| Property changes on: trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| 62 | 57 | Reverse-merged /branches/REL1_15/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:r51646 |
| 63 | 58 | Reverse-merged /branches/REL1_17/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:r81445,81448 |
| 64 | 59 | Reverse-merged /branches/sqlite/tests/phpunit/includes/parser/MediaWikiParserTest.php:r58211-58321 |
| 65 | 60 | Reverse-merged /branches/new-installer/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php:r43664-66004 |
| Property changes on: trunk/phase3/includes/templates/NoLocalSettings.php |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| 66 | 61 | Reverse-merged /branches/REL1_15/phase3/includes/templates/NoLocalSettings.php:r51646 |
| 67 | 62 | Reverse-merged /branches/sqlite/includes/templates/NoLocalSettings.php:r58211-58321 |
| 68 | 63 | Reverse-merged /branches/new-installer/phase3/includes/templates/NoLocalSettings.php:r43664-66004 |
| 69 | 64 | Reverse-merged /branches/wmf-deployment/includes/templates/NoLocalSettings.php:r53381 |