X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FEditPageTest.php;h=55d8fbb444bea193cf5c5ae07e97cb424f5f790c;hb=0a0d5cb7f7cd4479a7e8954d90422e6dda33d349;hp=036b61826e4e9b602c44fa0d21f783a732c37a7d;hpb=07d130702967826c07718b09573775e0d13e9e66;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php
index 036b61826e..55d8fbb444 100644
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @group Editing
  *
@@ -12,34 +14,22 @@
 class EditPageTest extends MediaWikiLangTestCase {
 
 	protected function setUp() {
-		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
-
 		parent::setUp();
 
-		$this->setContentLang( $wgContLang );
+		$contLang = MediaWikiServices::getInstance()->getContentLanguage();
+		$this->setContentLang( $contLang );
 
 		$this->setMwGlobals( [
-			'wgExtraNamespaces' => $wgExtraNamespaces,
-			'wgNamespaceContentModels' => $wgNamespaceContentModels,
-			'wgContentHandlers' => $wgContentHandlers,
+			'wgExtraNamespaces' => [
+				12312 => 'Dummy',
+				12313 => 'Dummy_talk',
+			],
+			'wgNamespaceContentModels' => [ 12312 => 'testing' ],
 		] );
-
-		$wgExtraNamespaces[12312] = 'Dummy';
-		$wgExtraNamespaces[12313] = 'Dummy_talk';
-
-		$wgNamespaceContentModels[12312] = "testing";
-		$wgContentHandlers["testing"] = 'DummyContentHandlerForTesting';
-
-		MWNamespace::clearCaches();
-		$wgContLang->resetNamespaces(); # reset namespace cache
-	}
-
-	protected function tearDown() {
-		global $wgContLang;
-
-		MWNamespace::clearCaches();
-		$wgContLang->resetNamespaces(); # reset namespace cache
-		parent::tearDown();
+		$this->mergeMwGlobalArrayValue(
+			'wgContentHandlers',
+			[ 'testing' => 'DummyContentHandlerForTesting' ]
+		);
 	}
 
 	/**
@@ -406,7 +396,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 
 		$page = $this->assertEdit( 'EditPageTest_testUpdatePage', "zero", null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $text,
-			"expected successfull update with given text" );
+			"expected successful update with given text" );
 		$this->assertGreaterThan( 0, $checkIds[0], "First event rev ID set" );
 
 		$this->forceRevisionDate( $page, '20120101000000' );
@@ -419,7 +409,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 
 		$this->assertEdit( 'EditPageTest_testUpdatePage', null, null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $text,
-			"expected successfull update with given text" );
+			"expected successful update with given text" );
 		$this->assertGreaterThan( 0, $checkIds[1], "Second edit hook rev ID set" );
 		$this->assertGreaterThan( $checkIds[0], $checkIds[1], "Second event rev ID is higher" );
 	}
@@ -433,7 +423,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 
 		$page = $this->assertEdit( 'EditPageTest_testTrxUpdatePage', "zero", null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $text,
-			"expected successfull update with given text" );
+			"expected successful update with given text" );
 
 		$this->forceRevisionDate( $page, '20120101000000' );
 
@@ -459,7 +449,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 
 		$this->assertEdit( 'EditPageTest_testTrxUpdatePage', null, null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $text,
-			"expected successfull update with given text" );
+			"expected successful update with given text" );
 
 		$text = "three";
 		$edit = [
@@ -469,7 +459,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 
 		$this->assertEdit( 'EditPageTest_testTrxUpdatePage', null, null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $text,
-			"expected successfull update with given text" );
+			"expected successful update with given text" );
 
 		wfGetDB( DB_MASTER )->commit( __METHOD__ );
 
@@ -544,7 +534,7 @@ hello
 
 		$this->assertEdit( 'EditPageTest_testSectionEdit', $base, null, $edit,
 			EditPage::AS_SUCCESS_UPDATE, $expected,
-			"expected successfull update of section" );
+			"expected successful update of section" );
 	}
 
 	public static function provideAutoMerge() {
@@ -685,7 +675,7 @@ hello
 
 		// first edit
 		$this->assertEdit( 'EditPageTest_testAutoMerge', null, 'Adam', $adamsEdit,
-			EditPage::AS_SUCCESS_UPDATE, null, "expected successfull update" );
+			EditPage::AS_SUCCESS_UPDATE, null, "expected successful update" );
 
 		// second edit
 		$this->assertEdit( 'EditPageTest_testAutoMerge', null, 'Berta', $bertasEdit,