X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiEditPageTest.php;h=7a8e208b0c0096246b4f2a831e5815d444279780;hb=c2e2afbc900dda1228f8ea6f5a3609d569fce00a;hp=4a90bf84587703e39d5c4e3e5813a0d61ba539a3;hpb=94068c3e811398b53cd53372a297239f9fd36012;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 4a90bf8458..7a8e208b0c 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -18,12 +18,12 @@ class ApiEditPageTest extends ApiTestCase {
 
 		parent::setUp();
 
-		$this->setMwGlobals( array(
+		$this->setMwGlobals( [
 			'wgExtraNamespaces' => $wgExtraNamespaces,
 			'wgNamespaceContentModels' => $wgNamespaceContentModels,
 			'wgContentHandlers' => $wgContentHandlers,
 			'wgContLang' => $wgContLang,
-		) );
+		] );
 
 		$wgExtraNamespaces[12312] = 'Dummy';
 		$wgExtraNamespaces[12313] = 'Dummy_talk';
@@ -51,11 +51,11 @@ class ApiEditPageTest extends ApiTestCase {
 		$name = 'Help:ApiEditPageTest_testEdit'; // assume Help namespace to default to wikitext
 
 		// -- test new page --------------------------------------------
-		$apiResult = $this->doApiRequestWithToken( array(
+		$apiResult = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => 'some text',
-		) );
+		] );
 		$apiResult = $apiResult[0];
 
 		// Validate API result data
@@ -69,11 +69,11 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->assertArrayHasKey( 'pageid', $apiResult['edit'] );
 
 		// -- test existing page, no change ----------------------------
-		$data = $this->doApiRequestWithToken( array(
+		$data = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => 'some text',
-		) );
+		] );
 
 		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
 
@@ -81,11 +81,11 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->assertArrayHasKey( 'nochange', $data[0]['edit'] );
 
 		// -- test existing page, with change --------------------------
-		$data = $this->doApiRequestWithToken( array(
+		$data = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => 'different text'
-		) );
+		] );
 
 		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
 
@@ -105,26 +105,26 @@ class ApiEditPageTest extends ApiTestCase {
 	 * @return array
 	 */
 	public static function provideEditAppend() {
-		return array(
-			array( # 0: append
+		return [
+			[ # 0: append
 				'foo', 'append', 'bar', "foobar"
-			),
-			array( # 1: prepend
+			],
+			[ # 1: prepend
 				'foo', 'prepend', 'bar', "barfoo"
-			),
-			array( # 2: append to empty page
+			],
+			[ # 2: append to empty page
 				'', 'append', 'foo', "foo"
-			),
-			array( # 3: prepend to empty page
+			],
+			[ # 3: prepend to empty page
 				'', 'prepend', 'foo', "foo"
-			),
-			array( # 4: append to non-existing page
+			],
+			[ # 4: append to non-existing page
 				null, 'append', 'foo', "foo"
-			),
-			array( # 5: prepend to non-existing page
+			],
+			[ # 5: prepend to non-existing page
 				null, 'prepend', 'foo', "foo"
-			),
-		);
+			],
+		];
 	}
 
 	/**
@@ -139,19 +139,19 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// -- create page (or not) -----------------------------------------
 		if ( $text !== null ) {
-			list( $re ) = $this->doApiRequestWithToken( array(
+			list( $re ) = $this->doApiRequestWithToken( [
 				'action' => 'edit',
 				'title' => $name,
-				'text' => $text, ) );
+				'text' => $text, ] );
 
 			$this->assertEquals( 'Success', $re['edit']['result'] ); // sanity
 		}
 
 		// -- try append/prepend --------------------------------------------
-		list( $re ) = $this->doApiRequestWithToken( array(
+		list( $re ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
-			$op . 'text' => $append, ) );
+			$op . 'text' => $append, ] );
 
 		$this->assertEquals( 'Success', $re['edit']['result'] );
 
@@ -175,12 +175,12 @@ class ApiEditPageTest extends ApiTestCase {
 		// Preload the page with some text
 		$page->doEditContent( ContentHandler::makeContent( $text, $page->getTitle() ), 'summary' );
 
-		list( $re ) = $this->doApiRequestWithToken( array(
+		list( $re ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'section' => '1',
 			'text' => "==section 1==\nnew content 1",
-		) );
+		] );
 		$this->assertEquals( 'Success', $re['edit']['result'] );
 		$newtext = WikiPage::factory( Title::newFromText( $name ) )
 			->getContent( Revision::RAW )
@@ -189,12 +189,12 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// Test that we raise a 'nosuchsection' error
 		try {
-			$this->doApiRequestWithToken( array(
+			$this->doApiRequestWithToken( [
 				'action' => 'edit',
 				'title' => $name,
 				'section' => '9999',
 				'text' => 'text',
-			) );
+			] );
 			$this->fail( "Should have raised a UsageException" );
 		} catch ( UsageException $e ) {
 			$this->assertEquals( 'nosuchsection', $e->getCodeString() );
@@ -212,13 +212,13 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// Test on a page that does not already exist
 		$this->assertFalse( Title::newFromText( $name )->exists() );
-		list( $re ) = $this->doApiRequestWithToken( array(
+		list( $re ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'section' => 'new',
 			'text' => 'test',
 			'summary' => 'header',
-		) );
+		] );
 
 		$this->assertEquals( 'Success', $re['edit']['result'] );
 		// Check the page text is correct
@@ -229,13 +229,13 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// Now on one that does
 		$this->assertTrue( Title::newFromText( $name )->exists() );
-		list( $re2 ) = $this->doApiRequestWithToken( array(
+		list( $re2 ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'section' => 'new',
 			'text' => 'test',
 			'summary' => 'header',
-		) );
+		] );
 
 		$this->assertEquals( 'Success', $re2['edit']['result'] );
 		$text = WikiPage::factory( Title::newFromText( $name ) )
@@ -277,14 +277,14 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->forceRevisionDate( $rpage, '20120101020202' );
 
 		// try to save edit, following the redirect
-		list( $re, , ) = $this->doApiRequestWithToken( array(
+		list( $re, , ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $rname,
 			'text' => 'nix bar!',
 			'basetimestamp' => $baseTime,
 			'section' => 'new',
 			'redirect' => true,
-		), null, self::$users['sysop']->getUser() );
+		], null, self::$users['sysop']->getUser() );
 
 		$this->assertEquals( 'Success', $re['edit']['result'],
 			"no problems expected when following redirect" );
@@ -324,13 +324,13 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// try to save edit, following the redirect but without creating a section
 		try {
-			$this->doApiRequestWithToken( array(
+			$this->doApiRequestWithToken( [
 				'action' => 'edit',
 				'title' => $rname,
 				'text' => 'nix bar!',
 				'basetimestamp' => $baseTime,
 				'redirect' => true,
-			), null, self::$users['sysop']->getUser() );
+			], null, self::$users['sysop']->getUser() );
 
 			$this->fail( 'redirect-appendonly error expected' );
 		} catch ( UsageException $ex ) {
@@ -361,12 +361,12 @@ class ApiEditPageTest extends ApiTestCase {
 
 		// try to save edit, expect conflict
 		try {
-			$this->doApiRequestWithToken( array(
+			$this->doApiRequestWithToken( [
 				'action' => 'edit',
 				'title' => $name,
 				'text' => 'nix bar!',
 				'basetimestamp' => $baseTime,
-			), null, self::$users['sysop']->getUser() );
+			], null, self::$users['sysop']->getUser() );
 
 			$this->fail( 'edit conflict expected' );
 		} catch ( UsageException $ex ) {
@@ -399,13 +399,13 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->forceRevisionDate( $page, '20120101020202' );
 
 		// try to save edit, expect no conflict
-		list( $re, , ) = $this->doApiRequestWithToken( array(
+		list( $re, , ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => 'nix bar!',
 			'basetimestamp' => $baseTime,
 			'section' => 'new',
-		), null, self::$users['sysop']->getUser() );
+		], null, self::$users['sysop']->getUser() );
 
 		$this->assertEquals( 'Success', $re['edit']['result'],
 			"no edit conflict expected here" );
@@ -446,13 +446,13 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->forceRevisionDate( $rpage, '20120101020202' );
 
 		// try to save edit; should work, following the redirect.
-		list( $re, , ) = $this->doApiRequestWithToken( array(
+		list( $re, , ) = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $rname,
 			'text' => 'nix bar!',
 			'section' => 'new',
 			'redirect' => true,
-		), null, self::$users['sysop']->getUser() );
+		], null, self::$users['sysop']->getUser() );
 
 		$this->assertEquals( 'Success', $re['edit']['result'],
 			"no edit conflict expected here" );
@@ -466,8 +466,8 @@ class ApiEditPageTest extends ApiTestCase {
 		$dbw = wfGetDB( DB_MASTER );
 
 		$dbw->update( 'revision',
-			array( 'rev_timestamp' => $dbw->timestamp( $timestamp ) ),
-			array( 'rev_id' => $page->getLatest() ) );
+			[ 'rev_timestamp' => $dbw->timestamp( $timestamp ) ],
+			[ 'rev_id' => $page->getLatest() ] );
 
 		$page->clear();
 	}
@@ -479,22 +479,22 @@ class ApiEditPageTest extends ApiTestCase {
 				'testing used by Dummy:ApiEditPageTest_nonTextPageEdit'
 		);
 
-		$this->doApiRequestWithToken( array(
+		$this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => 'Dummy:ApiEditPageTest_nonTextPageEdit',
 			'text' => '{"animals":["kittens!"]}'
-		) );
+		] );
 	}
 
 	public function testSupportsDirectApiEditing_withContentHandlerOverride() {
 		$name = 'DummyNonText:ApiEditPageTest_testNonTextEdit';
 		$data = serialize( 'some bla bla text' );
 
-		$result = $this->doApiRequestWithToken( array(
+		$result = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => $data,
-		) );
+		] );
 
 		$apiResult = $result[0];