X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiMessageTest.php;h=8764b4194f5b3e311a3d4f4f25ecc6a9967259e6;hb=dcdb8e463e3b2be121c61c91df13ea36d270a602;hp=56bbd064c51e632ec48d7578b99a1d048ea3cc96;hpb=d5ac32cc4fa6ab81ade7416802cb5d7e6ba787fd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiMessageTest.php b/tests/phpunit/includes/api/ApiMessageTest.php
index 56bbd064c5..8764b4194f 100644
--- a/tests/phpunit/includes/api/ApiMessageTest.php
+++ b/tests/phpunit/includes/api/ApiMessageTest.php
@@ -5,17 +5,17 @@
  */
 class ApiMessageTest extends MediaWikiTestCase {
 
-	private function compareMessages( $msg, $msg2 ) {
+	private function compareMessages( Message $msg, Message $msg2 ) {
 		$this->assertSame( $msg->getKey(), $msg2->getKey(), 'getKey' );
 		$this->assertSame( $msg->getKeysToTry(), $msg2->getKeysToTry(), 'getKeysToTry' );
 		$this->assertSame( $msg->getParams(), $msg2->getParams(), 'getParams' );
-		$this->assertSame( $msg->getFormat(), $msg2->getFormat(), 'getFormat' );
 		$this->assertSame( $msg->getLanguage(), $msg2->getLanguage(), 'getLanguage' );
 
 		$msg = TestingAccessWrapper::newFromObject( $msg );
 		$msg2 = TestingAccessWrapper::newFromObject( $msg2 );
 		$this->assertSame( $msg->interface, $msg2->interface, 'interface' );
 		$this->assertSame( $msg->useDatabase, $msg2->useDatabase, 'useDatabase' );
+		$this->assertSame( $msg->format, $msg2->format, 'format' );
 		$this->assertSame(
 			$msg->title ? $msg->title->getFullText() : null,
 			$msg2->title ? $msg2->title->getFullText() : null,
@@ -28,38 +28,38 @@ class ApiMessageTest extends MediaWikiTestCase {
 	 * @covers ApiMessageTrait
 	 */
 	public function testApiMessage() {
-		$msg = new Message( array( 'foo', 'bar' ), array( 'baz' ) );
+		$msg = new Message( [ 'foo', 'bar' ], [ 'baz' ] );
 		$msg->inLanguage( 'de' )->title( Title::newMainPage() );
-		$msg2 = new ApiMessage( $msg, 'code', array( 'data' ) );
+		$msg2 = new ApiMessage( $msg, 'code', [ 'data' ] );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
 		$msg2 = unserialize( serialize( $msg2 ) );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-		$msg = new Message( array( 'foo', 'bar' ), array( 'baz' ) );
-		$msg2 = new ApiMessage( array( array( 'foo', 'bar' ), 'baz' ), 'code', array( 'data' ) );
+		$msg = new Message( [ 'foo', 'bar' ], [ 'baz' ] );
+		$msg2 = new ApiMessage( [ [ 'foo', 'bar' ], 'baz' ], 'code', [ 'data' ] );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
 		$msg = new Message( 'foo' );
 		$msg2 = new ApiMessage( 'foo' );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'foo', $msg2->getApiCode() );
-		$this->assertEquals( array(), $msg2->getApiData() );
+		$this->assertEquals( [], $msg2->getApiData() );
 
-		$msg2->setApiCode( 'code', array( 'data' ) );
+		$msg2->setApiCode( 'code', [ 'data' ] );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 		$msg2->setApiCode( null );
 		$this->assertEquals( 'foo', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
-		$msg2->setApiData( array( 'data2' ) );
-		$this->assertEquals( array( 'data2' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
+		$msg2->setApiData( [ 'data2' ] );
+		$this->assertEquals( [ 'data2' ], $msg2->getApiData() );
 	}
 
 	/**
@@ -67,38 +67,38 @@ class ApiMessageTest extends MediaWikiTestCase {
 	 * @covers ApiMessageTrait
 	 */
 	public function testApiRawMessage() {
-		$msg = new RawMessage( 'foo', array( 'baz' ) );
+		$msg = new RawMessage( 'foo', [ 'baz' ] );
 		$msg->inLanguage( 'de' )->title( Title::newMainPage() );
-		$msg2 = new ApiRawMessage( $msg, 'code', array( 'data' ) );
+		$msg2 = new ApiRawMessage( $msg, 'code', [ 'data' ] );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
 		$msg2 = unserialize( serialize( $msg2 ) );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-		$msg = new RawMessage( 'foo', array( 'baz' ) );
-		$msg2 = new ApiRawMessage( array( 'foo', 'baz' ), 'code', array( 'data' ) );
+		$msg = new RawMessage( 'foo', [ 'baz' ] );
+		$msg2 = new ApiRawMessage( [ 'foo', 'baz' ], 'code', [ 'data' ] );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
 		$msg = new RawMessage( 'foo' );
-		$msg2 = new ApiRawMessage( 'foo', 'code', array( 'data' ) );
+		$msg2 = new ApiRawMessage( 'foo', 'code', [ 'data' ] );
 		$this->compareMessages( $msg, $msg2 );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-		$msg2->setApiCode( 'code', array( 'data' ) );
+		$msg2->setApiCode( 'code', [ 'data' ] );
 		$this->assertEquals( 'code', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
 		$msg2->setApiCode( null );
 		$this->assertEquals( 'foo', $msg2->getApiCode() );
-		$this->assertEquals( array( 'data' ), $msg2->getApiData() );
-		$msg2->setApiData( array( 'data2' ) );
-		$this->assertEquals( array( 'data2' ), $msg2->getApiData() );
+		$this->assertEquals( [ 'data' ], $msg2->getApiData() );
+		$msg2->setApiData( [ 'data2' ] );
+		$this->assertEquals( [ 'data2' ], $msg2->getApiData() );
 	}
 
 	/**