X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FEditPageTest.php;h=51f00832bab0aca85fc7982b9d7c694580f3edb0;hb=36171312ef0e1b9acdea876f300dca8f3ad9982e;hp=27959b1d58b1a1be3b3079875df657dbaaaad644;hpb=bddd43811e355b22ad66affe22f7fb4253e399d1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php
index 27959b1d58..51f00832ba 100644
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -138,7 +138,7 @@ class EditPageTest extends MediaWikiLangTestCase {
 			$page->doEditContent( $content, "base text for test" );
 			$this->forceRevisionDate( $page, '20120101000000' );
 
-			//sanity check
+			// sanity check
 			$page->clear();
 			$currentText = ContentHandler::getContentText( $page->getContent() );
 
@@ -335,7 +335,7 @@ hello
 		$textWithNewSectionAdded = "$text\n$newSection";
 
 		return array(
-			array( #0
+			array( # 0
 				$text,
 				'',
 				'hello',
@@ -343,7 +343,7 @@ hello
 				'hello'
 			),
 
-			array( #1
+			array( # 1
 				$text,
 				'1',
 				$sectionOne,
@@ -351,7 +351,7 @@ hello
 				$textWithNewSectionOne,
 			),
 
-			array( #2
+			array( # 2
 				$text,
 				'new',
 				'hello',
@@ -380,14 +380,14 @@ hello
 	public static function provideAutoMerge() {
 		$tests = array();
 
-		$tests[] = array( #0: plain conflict
+		$tests[] = array( # 0: plain conflict
 			"Elmo", # base edit user
 			"one\n\ntwo\n\nthree\n",
-			array( #adam's edit
+			array( # adam's edit
 				'wpStarttime' => 1,
 				'wpTextbox1' => "ONE\n\ntwo\n\nthree\n",
 			),
-			array( #berta's edit
+			array( # berta's edit
 				'wpStarttime' => 2,
 				'wpTextbox1' => "(one)\n\ntwo\n\nthree\n",
 			),
@@ -396,14 +396,14 @@ hello
 			'expected edit conflict', # message
 		);
 
-		$tests[] = array( #1: successful merge
+		$tests[] = array( # 1: successful merge
 			"Elmo", # base edit user
 			"one\n\ntwo\n\nthree\n",
-			array( #adam's edit
+			array( # adam's edit
 				'wpStarttime' => 1,
 				'wpTextbox1' => "ONE\n\ntwo\n\nthree\n",
 			),
-			array( #berta's edit
+			array( # berta's edit
 				'wpStarttime' => 2,
 				'wpTextbox1' => "one\n\ntwo\n\nTHREE\n",
 			),
@@ -424,15 +424,15 @@ hello
 		// generate expected text after merge
 		$expected = str_replace( 'one', 'ONE', str_replace( 'three', 'THREE', $text ) );
 
-		$tests[] = array( #2: merge in section
+		$tests[] = array( # 2: merge in section
 			"Elmo", # base edit user
 			$text,
-			array( #adam's edit
+			array( # adam's edit
 				'wpStarttime' => 1,
 				'wpTextbox1' => str_replace( 'one', 'ONE', $section ),
 				'wpSection' => '1'
 			),
-			array( #berta's edit
+			array( # berta's edit
 				'wpStarttime' => 2,
 				'wpTextbox1' => str_replace( 'three', 'THREE', $section ),
 				'wpSection' => '1'
@@ -465,7 +465,7 @@ hello
 	) {
 		$this->checkHasDiff3();
 
-		//create page
+		// create page
 		$ns = $this->getDefaultWikitextNS();
 		$title = Title::newFromText( 'EditPageTest_testAutoMerge', $ns );
 		$page = WikiPage::factory( $title );