X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiResultTest.php;h=7c0063d4045be00daffea26a291c29f9cfa8959d;hb=2aff530dfb43a16e0e838f39cf354e47d7c90ac7;hp=292d276b681f8d8227f03c02b0f95d6109574a97;hpb=a0e11fff0c12b73aa2d9083b32a066f61e55399e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index 292d276b68..7c0063d404 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -10,7 +10,7 @@ class ApiResultTest extends MediaWikiTestCase {
 	 * @covers ApiResult
 	 */
 	public function testStaticDataMethods() {
-		$arr = array();
+		$arr = [];
 
 		ApiResult::setValue( $arr, 'setValue', '1' );
 
@@ -22,13 +22,13 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		ApiResult::setContentValue( $arr, 'setContentValue', '3' );
 
-		$this->assertSame( array(
+		$this->assertSame( [
 			'setValue' => '1',
 			'unnamed 1',
 			'unnamed 2',
 			ApiResult::META_CONTENT => 'setContentValue',
 			'setContentValue' => '3',
-		), $arr );
+		], $arr );
 
 		try {
 			ApiResult::setValue( $arr, 'setValue', '99' );
@@ -59,21 +59,21 @@ class ApiResultTest extends MediaWikiTestCase {
 		ApiResult::setContentValue( $arr, 'setContentValue2', '99', ApiResult::OVERRIDE );
 		$this->assertSame( 'setContentValue2', $arr[ApiResult::META_CONTENT] );
 
-		$arr = array( 'foo' => 1, 'bar' => 1 );
+		$arr = [ 'foo' => 1, 'bar' => 1 ];
 		ApiResult::setValue( $arr, 'top', '2', ApiResult::ADD_ON_TOP );
 		ApiResult::setValue( $arr, null, '2', ApiResult::ADD_ON_TOP );
 		ApiResult::setValue( $arr, 'bottom', '2' );
 		ApiResult::setValue( $arr, 'foo', '2', ApiResult::OVERRIDE );
 		ApiResult::setValue( $arr, 'bar', '2', ApiResult::OVERRIDE | ApiResult::ADD_ON_TOP );
-		$this->assertSame( array( 0, 'top', 'foo', 'bar', 'bottom' ), array_keys( $arr ) );
+		$this->assertSame( [ 0, 'top', 'foo', 'bar', 'bottom' ], array_keys( $arr ) );
 
-		$arr = array();
-		ApiResult::setValue( $arr, 'sub', array( 'foo' => 1 ) );
-		ApiResult::setValue( $arr, 'sub', array( 'bar' => 1 ) );
-		$this->assertSame( array( 'sub' => array( 'foo' => 1, 'bar' => 1 ) ), $arr );
+		$arr = [];
+		ApiResult::setValue( $arr, 'sub', [ 'foo' => 1 ] );
+		ApiResult::setValue( $arr, 'sub', [ 'bar' => 1 ] );
+		$this->assertSame( [ 'sub' => [ 'foo' => 1, 'bar' => 1 ] ], $arr );
 
 		try {
-			ApiResult::setValue( $arr, 'sub', array( 'foo' => 2, 'baz' => 2 ) );
+			ApiResult::setValue( $arr, 'sub', [ 'foo' => 2, 'baz' => 2 ] );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( RuntimeException $ex ) {
 			$this->assertSame(
@@ -83,17 +83,17 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
-		$arr = array();
+		$arr = [];
 		$title = Title::newFromText( "MediaWiki:Foobar" );
 		$obj = new stdClass;
 		$obj->foo = 1;
 		$obj->bar = 2;
 		ApiResult::setValue( $arr, 'title', $title );
 		ApiResult::setValue( $arr, 'obj', $obj );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'title' => (string)$title,
-			'obj' => array( 'foo' => 1, 'bar' => 2, ApiResult::META_TYPE => 'assoc' ),
-		), $arr );
+			'obj' => [ 'foo' => 1, 'bar' => 2, ApiResult::META_TYPE => 'assoc' ],
+		], $arr );
 
 		$fh = tmpfile();
 		try {
@@ -194,41 +194,41 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
-		$arr = array();
+		$arr = [];
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
 		ApiResult::setValue( $arr, 'baz', $result2 );
-		$this->assertSame( array(
-			'baz' => array(
+		$this->assertSame( [
+			'baz' => [
 				ApiResult::META_TYPE => 'assoc',
 				'foo' => 'bar',
-			)
-		), $arr );
+			]
+		], $arr );
 
-		$arr = array();
+		$arr = [];
 		ApiResult::setValue( $arr, 'foo', "foo\x80bar" );
 		ApiResult::setValue( $arr, 'bar', "a\xcc\x81" );
 		ApiResult::setValue( $arr, 'baz', 74 );
 		ApiResult::setValue( $arr, null, "foo\x80bar" );
 		ApiResult::setValue( $arr, null, "a\xcc\x81" );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'foo' => "foo\xef\xbf\xbdbar",
 			'bar' => "\xc3\xa1",
 			'baz' => 74,
 			0 => "foo\xef\xbf\xbdbar",
 			1 => "\xc3\xa1",
-		), $arr );
+		], $arr );
 
 		$obj = new stdClass;
 		$obj->{'1'} = 'one';
-		$arr = array();
+		$arr = [];
 		ApiResult::setValue( $arr, 'foo', $obj );
-		$this->assertSame( array(
-			'foo' => array(
+		$this->assertSame( [
+			'foo' => [
 				1 => 'one',
 				ApiResult::META_TYPE => 'assoc',
-			)
-		), $arr );
+			]
+		], $arr );
 	}
 
 	/**
@@ -245,20 +245,20 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result->addValue( null, 'deleteValue', '2' );
 		$result->removeValue( null, 'deleteValue' );
 
-		$result->addValue( array( 'a', 'b' ), 'deleteValue', '3' );
-		$result->removeValue( array( 'a', 'b', 'deleteValue' ), null, '3' );
+		$result->addValue( [ 'a', 'b' ], 'deleteValue', '3' );
+		$result->removeValue( [ 'a', 'b', 'deleteValue' ], null, '3' );
 
 		$result->addContentValue( null, 'setContentValue', '3' );
 
-		$this->assertSame( array(
+		$this->assertSame( [
 			'setValue' => '1',
 			'unnamed 1',
 			'unnamed 2',
-			'a' => array( 'b' => array() ),
+			'a' => [ 'b' => [] ],
 			'setContentValue' => '3',
 			ApiResult::META_TYPE => 'assoc',
 			ApiResult::META_CONTENT => 'setContentValue',
-		), $result->getResultData() );
+		], $result->getResultData() );
 		$this->assertSame( 20, $result->getSize() );
 
 		try {
@@ -285,16 +285,16 @@ class ApiResultTest extends MediaWikiTestCase {
 		}
 
 		$result->addValue( null, 'setValue', '99', ApiResult::OVERRIDE );
-		$this->assertSame( '99', $result->getResultData( array( 'setValue' ) ) );
+		$this->assertSame( '99', $result->getResultData( [ 'setValue' ] ) );
 
 		$result->addContentValue( null, 'setContentValue2', '99', ApiResult::OVERRIDE );
 		$this->assertSame( 'setContentValue2',
-			$result->getResultData( array( ApiResult::META_CONTENT ) ) );
+			$result->getResultData( [ ApiResult::META_CONTENT ] ) );
 
 		$result->reset();
-		$this->assertSame( array(
+		$this->assertSame( [
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 		$this->assertSame( 0, $result->getSize() );
 
 		$result->addValue( null, 'foo', 1 );
@@ -304,26 +304,26 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result->addValue( null, 'bottom', '2' );
 		$result->addValue( null, 'foo', '2', ApiResult::OVERRIDE );
 		$result->addValue( null, 'bar', '2', ApiResult::OVERRIDE | ApiResult::ADD_ON_TOP );
-		$this->assertSame( array( 0, 'top', 'foo', 'bar', 'bottom', ApiResult::META_TYPE ),
+		$this->assertSame( [ 0, 'top', 'foo', 'bar', 'bottom', ApiResult::META_TYPE ],
 			array_keys( $result->getResultData() ) );
 
 		$result->reset();
-		$result->addValue( null, 'foo', array( 'bar' => 1 ) );
-		$result->addValue( array( 'foo', 'top' ), 'x', 2, ApiResult::ADD_ON_TOP );
-		$result->addValue( array( 'foo', 'bottom' ), 'x', 2 );
-		$this->assertSame( array( 'top', 'bar', 'bottom' ),
-			array_keys( $result->getResultData( array( 'foo' ) ) ) );
+		$result->addValue( null, 'foo', [ 'bar' => 1 ] );
+		$result->addValue( [ 'foo', 'top' ], 'x', 2, ApiResult::ADD_ON_TOP );
+		$result->addValue( [ 'foo', 'bottom' ], 'x', 2 );
+		$this->assertSame( [ 'top', 'bar', 'bottom' ],
+			array_keys( $result->getResultData( [ 'foo' ] ) ) );
 
 		$result->reset();
-		$result->addValue( null, 'sub', array( 'foo' => 1 ) );
-		$result->addValue( null, 'sub', array( 'bar' => 1 ) );
-		$this->assertSame( array(
-			'sub' => array( 'foo' => 1, 'bar' => 1 ),
+		$result->addValue( null, 'sub', [ 'foo' => 1 ] );
+		$result->addValue( null, 'sub', [ 'bar' => 1 ] );
+		$this->assertSame( [
+			'sub' => [ 'foo' => 1, 'bar' => 1 ],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 
 		try {
-			$result->addValue( null, 'sub', array( 'foo' => 2, 'baz' => 2 ) );
+			$result->addValue( null, 'sub', [ 'foo' => 2, 'baz' => 2 ] );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( RuntimeException $ex ) {
 			$this->assertSame(
@@ -340,11 +340,11 @@ class ApiResultTest extends MediaWikiTestCase {
 		$obj->bar = 2;
 		$result->addValue( null, 'title', $title );
 		$result->addValue( null, 'obj', $obj );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'title' => (string)$title,
-			'obj' => array( 'foo' => 1, 'bar' => 2, ApiResult::META_TYPE => 'assoc' ),
+			'obj' => [ 'foo' => 1, 'bar' => 2, ApiResult::META_TYPE => 'assoc' ],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 
 		$fh = tmpfile();
 		try {
@@ -447,19 +447,19 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		$result->reset();
 		$result->addParsedLimit( 'foo', 12 );
-		$this->assertSame( array(
-			'limits' => array( 'foo' => 12 ),
+		$this->assertSame( [
+			'limits' => [ 'foo' => 12 ],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 		$result->addParsedLimit( 'foo', 13 );
-		$this->assertSame( array(
-			'limits' => array( 'foo' => 13 ),
+		$this->assertSame( [
+			'limits' => [ 'foo' => 13 ],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
-		$this->assertSame( null, $result->getResultData( array( 'foo', 'bar', 'baz' ) ) );
-		$this->assertSame( 13, $result->getResultData( array( 'limits', 'foo' ) ) );
+		], $result->getResultData() );
+		$this->assertSame( null, $result->getResultData( [ 'foo', 'bar', 'baz' ] ) );
+		$this->assertSame( 13, $result->getResultData( [ 'limits', 'foo' ] ) );
 		try {
-			$result->getResultData( array( 'limits', 'foo', 'bar' ) );
+			$result->getResultData( [ 'limits', 'foo', 'bar' ] );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( InvalidArgumentException $ex ) {
 			$this->assertSame(
@@ -471,7 +471,7 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		// Add two values and some metadata, but ensure metadata is not counted
 		$result = new ApiResult( 100 );
-		$obj = array( 'attr' => '12345' );
+		$obj = [ 'attr' => '12345' ];
 		ApiResult::setContentValue( $obj, 'content', '1234567890' );
 		$this->assertTrue( $result->addValue( null, 'foo', $obj ) );
 		$this->assertSame( 15, $result->getSize() );
@@ -498,13 +498,13 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
 		$result->addValue( null, 'baz', $result2 );
-		$this->assertSame( array(
-			'baz' => array(
+		$this->assertSame( [
+			'baz' => [
 				'foo' => 'bar',
 				ApiResult::META_TYPE => 'assoc',
-			),
+			],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 
 		$result = new ApiResult( 8388608 );
 		$result->addValue( null, 'foo', "foo\x80bar" );
@@ -512,89 +512,89 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result->addValue( null, 'baz', 74 );
 		$result->addValue( null, null, "foo\x80bar" );
 		$result->addValue( null, null, "a\xcc\x81" );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'foo' => "foo\xef\xbf\xbdbar",
 			'bar' => "\xc3\xa1",
 			'baz' => 74,
 			0 => "foo\xef\xbf\xbdbar",
 			1 => "\xc3\xa1",
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 
 		$result = new ApiResult( 8388608 );
 		$obj = new stdClass;
 		$obj->{'1'} = 'one';
-		$arr = array();
+		$arr = [];
 		$result->addValue( $arr, 'foo', $obj );
-		$this->assertSame( array(
-			'foo' => array(
+		$this->assertSame( [
+			'foo' => [
 				1 => 'one',
 				ApiResult::META_TYPE => 'assoc',
-			),
+			],
 			ApiResult::META_TYPE => 'assoc',
-		), $result->getResultData() );
+		], $result->getResultData() );
 	}
 
 	/**
 	 * @covers ApiResult
 	 */
 	public function testMetadata() {
-		$arr = array( 'foo' => array( 'bar' => array() ) );
+		$arr = [ 'foo' => [ 'bar' => [] ] ];
 		$result = new ApiResult( 8388608 );
-		$result->addValue( null, 'foo', array( 'bar' => array() ) );
+		$result->addValue( null, 'foo', [ 'bar' => [] ] );
 
-		$expect = array(
-			'foo' => array(
-				'bar' => array(
+		$expect = [
+			'foo' => [
+				'bar' => [
 					ApiResult::META_INDEXED_TAG_NAME => 'ritn',
 					ApiResult::META_TYPE => 'default',
-				),
+				],
 				ApiResult::META_INDEXED_TAG_NAME => 'ritn',
 				ApiResult::META_TYPE => 'default',
-			),
-			ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+			],
+			ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'itn',
-			ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar' ),
+			ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar' ],
 			ApiResult::META_TYPE => 'array',
-		);
+		];
 
 		ApiResult::setSubelementsList( $arr, 'foo' );
-		ApiResult::setSubelementsList( $arr, array( 'bar', 'baz' ) );
+		ApiResult::setSubelementsList( $arr, [ 'bar', 'baz' ] );
 		ApiResult::unsetSubelementsList( $arr, 'baz' );
 		ApiResult::setIndexedTagNameRecursive( $arr, 'ritn' );
 		ApiResult::setIndexedTagName( $arr, 'itn' );
 		ApiResult::setPreserveKeysList( $arr, 'foo' );
-		ApiResult::setPreserveKeysList( $arr, array( 'bar', 'baz' ) );
+		ApiResult::setPreserveKeysList( $arr, [ 'bar', 'baz' ] );
 		ApiResult::unsetPreserveKeysList( $arr, 'baz' );
 		ApiResult::setArrayTypeRecursive( $arr, 'default' );
 		ApiResult::setArrayType( $arr, 'array' );
 		$this->assertSame( $expect, $arr );
 
 		$result->addSubelementsList( null, 'foo' );
-		$result->addSubelementsList( null, array( 'bar', 'baz' ) );
+		$result->addSubelementsList( null, [ 'bar', 'baz' ] );
 		$result->removeSubelementsList( null, 'baz' );
 		$result->addIndexedTagNameRecursive( null, 'ritn' );
 		$result->addIndexedTagName( null, 'itn' );
 		$result->addPreserveKeysList( null, 'foo' );
-		$result->addPreserveKeysList( null, array( 'bar', 'baz' ) );
+		$result->addPreserveKeysList( null, [ 'bar', 'baz' ] );
 		$result->removePreserveKeysList( null, 'baz' );
 		$result->addArrayTypeRecursive( null, 'default' );
 		$result->addArrayType( null, 'array' );
 		$this->assertEquals( $expect, $result->getResultData() );
 
-		$arr = array( 'foo' => array( 'bar' => array() ) );
-		$expect = array(
-			'foo' => array(
-				'bar' => array(
+		$arr = [ 'foo' => [ 'bar' => [] ] ];
+		$expect = [
+			'foo' => [
+				'bar' => [
 					ApiResult::META_TYPE => 'kvp',
 					ApiResult::META_KVP_KEY_NAME => 'key',
-				),
+				],
 				ApiResult::META_TYPE => 'kvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
-			),
+			],
 			ApiResult::META_TYPE => 'BCkvp',
 			ApiResult::META_KVP_KEY_NAME => 'bc',
-		);
+		];
 		ApiResult::setArrayTypeRecursive( $arr, 'kvp', 'key' );
 		ApiResult::setArrayType( $arr, 'BCkvp', 'bc' );
 		$this->assertSame( $expect, $arr );
@@ -604,89 +604,89 @@ class ApiResultTest extends MediaWikiTestCase {
 	 * @covers ApiResult
 	 */
 	public function testUtilityFunctions() {
-		$arr = array(
-			'foo' => array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+		$arr = [
+			'foo' => [
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
-			'foo2' => (object)array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+			],
+			'foo2' => (object)[
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
-			ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+			],
+			ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'itn',
-			ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+			ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 			ApiResult::META_TYPE => 'array',
 			'_dummy' => 'foobaz',
 			'_dummy2' => 'foobaz!',
-		);
-		$this->assertEquals( array(
-			'foo' => array(
-				'bar' => array(),
-				'bar2' => (object)array(),
+		];
+		$this->assertEquals( [
+			'foo' => [
+				'bar' => [],
+				'bar2' => (object)[],
 				'x' => 'ok',
-			),
-			'foo2' => (object)array(
-				'bar' => array(),
-				'bar2' => (object)array(),
+			],
+			'foo2' => (object)[
+				'bar' => [],
+				'bar2' => (object)[],
 				'x' => 'ok',
-			),
+			],
 			'_dummy2' => 'foobaz!',
-		), ApiResult::stripMetadata( $arr ), 'ApiResult::stripMetadata' );
+		], ApiResult::stripMetadata( $arr ), 'ApiResult::stripMetadata' );
 
-		$metadata = array();
+		$metadata = [];
 		$data = ApiResult::stripMetadataNonRecursive( $arr, $metadata );
-		$this->assertEquals( array(
-			'foo' => array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+		$this->assertEquals( [
+			'foo' => [
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
-			'foo2' => (object)array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+			],
+			'foo2' => (object)[
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
+			],
 			'_dummy2' => 'foobaz!',
-		), $data, 'ApiResult::stripMetadataNonRecursive ($data)' );
-		$this->assertEquals( array(
-			ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+		], $data, 'ApiResult::stripMetadataNonRecursive ($data)' );
+		$this->assertEquals( [
+			ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'itn',
-			ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+			ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 			ApiResult::META_TYPE => 'array',
 			'_dummy' => 'foobaz',
-		), $metadata, 'ApiResult::stripMetadataNonRecursive ($metadata)' );
+		], $metadata, 'ApiResult::stripMetadataNonRecursive ($metadata)' );
 
 		$metadata = null;
 		$data = ApiResult::stripMetadataNonRecursive( (object)$arr, $metadata );
-		$this->assertEquals( (object)array(
-			'foo' => array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+		$this->assertEquals( (object)[
+			'foo' => [
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
-			'foo2' => (object)array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'bar2' => (object)array( '_dummy' => 'foobaz' ),
+			],
+			'foo2' => (object)[
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'bar2' => (object)[ '_dummy' => 'foobaz' ],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
+			],
 			'_dummy2' => 'foobaz!',
-		), $data, 'ApiResult::stripMetadataNonRecursive on object ($data)' );
-		$this->assertEquals( array(
-			ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+		], $data, 'ApiResult::stripMetadataNonRecursive on object ($data)' );
+		$this->assertEquals( [
+			ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'itn',
-			ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+			ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 			ApiResult::META_TYPE => 'array',
 			'_dummy' => 'foobaz',
-		), $metadata, 'ApiResult::stripMetadataNonRecursive on object ($metadata)' );
+		], $metadata, 'ApiResult::stripMetadataNonRecursive on object ($metadata)' );
 	}
 
 	/**
@@ -716,520 +716,520 @@ class ApiResultTest extends MediaWikiTestCase {
 
 	public function provideTransformations() {
 		$kvp = function ( $keyKey, $key, $valKey, $value ) {
-			return array(
+			return [
 				$keyKey => $key,
 				$valKey => $value,
-				ApiResult::META_PRESERVE_KEYS => array( $keyKey ),
+				ApiResult::META_PRESERVE_KEYS => [ $keyKey ],
 				ApiResult::META_CONTENT => $valKey,
 				ApiResult::META_TYPE => 'assoc',
-			);
+			];
 		};
-		$typeArr = array(
-			'defaultArray' => array( 2 => 'a', 0 => 'b', 1 => 'c' ),
-			'defaultAssoc' => array( 'x' => 'a', 1 => 'b', 0 => 'c' ),
-			'defaultAssoc2' => array( 2 => 'a', 3 => 'b', 0 => 'c' ),
-			'array' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'array' ),
-			'BCarray' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'BCarray' ),
-			'BCassoc' => array( 'a', 'b', 'c', ApiResult::META_TYPE => 'BCassoc' ),
-			'assoc' => array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-			'kvp' => array( 'x' => 'a', 'y' => 'b', 'z' => array( 'c' ), ApiResult::META_TYPE => 'kvp' ),
-			'BCkvp' => array( 'x' => 'a', 'y' => 'b',
+		$typeArr = [
+			'defaultArray' => [ 2 => 'a', 0 => 'b', 1 => 'c' ],
+			'defaultAssoc' => [ 'x' => 'a', 1 => 'b', 0 => 'c' ],
+			'defaultAssoc2' => [ 2 => 'a', 3 => 'b', 0 => 'c' ],
+			'array' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'array' ],
+			'BCarray' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'BCarray' ],
+			'BCassoc' => [ 'a', 'b', 'c', ApiResult::META_TYPE => 'BCassoc' ],
+			'assoc' => [ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+			'kvp' => [ 'x' => 'a', 'y' => 'b', 'z' => [ 'c' ], ApiResult::META_TYPE => 'kvp' ],
+			'BCkvp' => [ 'x' => 'a', 'y' => 'b',
 				ApiResult::META_TYPE => 'BCkvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
-			),
-			'kvpmerge' => array( 'x' => 'a', 'y' => array( 'b' ), 'z' => array( 'c' => 'd' ),
+			],
+			'kvpmerge' => [ 'x' => 'a', 'y' => [ 'b' ], 'z' => [ 'c' => 'd' ],
 				ApiResult::META_TYPE => 'kvp',
 				ApiResult::META_KVP_MERGE => true,
-			),
-			'emptyDefault' => array( '_dummy' => 1 ),
-			'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+			],
+			'emptyDefault' => [ '_dummy' => 1 ],
+			'emptyAssoc' => [ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 			'_dummy' => 1,
-			ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
-		);
-		$stripArr = array(
-			'foo' => array(
-				'bar' => array( '_dummy' => 'foobaz' ),
-				'baz' => array(
-					ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+			ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
+		];
+		$stripArr = [
+			'foo' => [
+				'bar' => [ '_dummy' => 'foobaz' ],
+				'baz' => [
+					ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 					ApiResult::META_INDEXED_TAG_NAME => 'itn',
-					ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+					ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 					ApiResult::META_TYPE => 'array',
-				),
+				],
 				'x' => 'ok',
 				'_dummy' => 'foobaz',
-			),
-			ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+			],
+			ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'itn',
-			ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+			ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 			ApiResult::META_TYPE => 'array',
 			'_dummy' => 'foobaz',
 			'_dummy2' => 'foobaz!',
-		);
+		];
 
-		return array(
-			array(
+		return [
+			[
 				'BC: META_BC_BOOLS',
-				array(
+				[
 					'BCtrue' => true,
 					'BCfalse' => false,
 					'true' => true,
 					'false' => false,
-					ApiResult::META_BC_BOOLS => array( 0, 'true', 'false' ),
-				),
-				array( 'BC' => array() ),
-				array(
+					ApiResult::META_BC_BOOLS => [ 0, 'true', 'false' ],
+				],
+				[ 'BC' => [] ],
+				[
 					'BCtrue' => '',
 					'true' => true,
 					'false' => false,
-					ApiResult::META_BC_BOOLS => array( 0, 'true', 'false' ),
-				)
-			),
-			array(
+					ApiResult::META_BC_BOOLS => [ 0, 'true', 'false' ],
+				]
+			],
+			[
 				'BC: META_BC_SUBELEMENTS',
-				array(
+				[
 					'bc' => 'foo',
 					'nobc' => 'bar',
-					ApiResult::META_BC_SUBELEMENTS => array( 'bc' ),
-				),
-				array( 'BC' => array() ),
-				array(
-					'bc' => array(
+					ApiResult::META_BC_SUBELEMENTS => [ 'bc' ],
+				],
+				[ 'BC' => [] ],
+				[
+					'bc' => [
 						'*' => 'foo',
 						ApiResult::META_CONTENT => '*',
 						ApiResult::META_TYPE => 'assoc',
-					),
+					],
 					'nobc' => 'bar',
-					ApiResult::META_BC_SUBELEMENTS => array( 'bc' ),
-				),
-			),
-			array(
+					ApiResult::META_BC_SUBELEMENTS => [ 'bc' ],
+				],
+			],
+			[
 				'BC: META_CONTENT',
-				array(
+				[
 					'content' => '!!!',
 					ApiResult::META_CONTENT => 'content',
-				),
-				array( 'BC' => array() ),
-				array(
+				],
+				[ 'BC' => [] ],
+				[
 					'*' => '!!!',
 					ApiResult::META_CONTENT => '*',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'BC: BCkvp type',
-				array(
+				[
 					'foo' => 'foo value',
 					'bar' => 'bar value',
 					'_baz' => 'baz value',
 					ApiResult::META_TYPE => 'BCkvp',
 					ApiResult::META_KVP_KEY_NAME => 'key',
-					ApiResult::META_PRESERVE_KEYS => array( '_baz' ),
-				),
-				array( 'BC' => array() ),
-				array(
+					ApiResult::META_PRESERVE_KEYS => [ '_baz' ],
+				],
+				[ 'BC' => [] ],
+				[
 					$kvp( 'key', 'foo', '*', 'foo value' ),
 					$kvp( 'key', 'bar', '*', 'bar value' ),
 					$kvp( 'key', '_baz', '*', 'baz value' ),
 					ApiResult::META_TYPE => 'array',
 					ApiResult::META_KVP_KEY_NAME => 'key',
-					ApiResult::META_PRESERVE_KEYS => array( '_baz' ),
-				),
-			),
-			array(
+					ApiResult::META_PRESERVE_KEYS => [ '_baz' ],
+				],
+			],
+			[
 				'BC: BCarray type',
-				array(
+				[
 					ApiResult::META_TYPE => 'BCarray',
-				),
-				array( 'BC' => array() ),
-				array(
+				],
+				[ 'BC' => [] ],
+				[
 					ApiResult::META_TYPE => 'default',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'BC: BCassoc type',
-				array(
+				[
 					ApiResult::META_TYPE => 'BCassoc',
-				),
-				array( 'BC' => array() ),
-				array(
+				],
+				[ 'BC' => [] ],
+				[
 					ApiResult::META_TYPE => 'default',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'BC: BCkvp exception',
-				array(
+				[
 					ApiResult::META_TYPE => 'BCkvp',
-				),
-				array( 'BC' => array() ),
+				],
+				[ 'BC' => [] ],
 				new UnexpectedValueException(
 					'Type "BCkvp" used without setting ApiResult::META_KVP_KEY_NAME metadata item'
 				),
-			),
-			array(
+			],
+			[
 				'BC: nobool, no*, nosub',
-				array(
+				[
 					'true' => true,
 					'false' => false,
 					'content' => 'content',
 					ApiResult::META_CONTENT => 'content',
 					'bc' => 'foo',
-					ApiResult::META_BC_SUBELEMENTS => array( 'bc' ),
-					'BCarray' => array( ApiResult::META_TYPE => 'BCarray' ),
-					'BCassoc' => array( ApiResult::META_TYPE => 'BCassoc' ),
-					'BCkvp' => array(
+					ApiResult::META_BC_SUBELEMENTS => [ 'bc' ],
+					'BCarray' => [ ApiResult::META_TYPE => 'BCarray' ],
+					'BCassoc' => [ ApiResult::META_TYPE => 'BCassoc' ],
+					'BCkvp' => [
 						'foo' => 'foo value',
 						'bar' => 'bar value',
 						'_baz' => 'baz value',
 						ApiResult::META_TYPE => 'BCkvp',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-						ApiResult::META_PRESERVE_KEYS => array( '_baz' ),
-					),
-				),
-				array( 'BC' => array( 'nobool', 'no*', 'nosub' ) ),
-				array(
+						ApiResult::META_PRESERVE_KEYS => [ '_baz' ],
+					],
+				],
+				[ 'BC' => [ 'nobool', 'no*', 'nosub' ] ],
+				[
 					'true' => true,
 					'false' => false,
 					'content' => 'content',
 					'bc' => 'foo',
-					'BCarray' => array( ApiResult::META_TYPE => 'default' ),
-					'BCassoc' => array( ApiResult::META_TYPE => 'default' ),
-					'BCkvp' => array(
+					'BCarray' => [ ApiResult::META_TYPE => 'default' ],
+					'BCassoc' => [ ApiResult::META_TYPE => 'default' ],
+					'BCkvp' => [
 						$kvp( 'key', 'foo', '*', 'foo value' ),
 						$kvp( 'key', 'bar', '*', 'bar value' ),
 						$kvp( 'key', '_baz', '*', 'baz value' ),
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-						ApiResult::META_PRESERVE_KEYS => array( '_baz' ),
-					),
+						ApiResult::META_PRESERVE_KEYS => [ '_baz' ],
+					],
 					ApiResult::META_CONTENT => 'content',
-					ApiResult::META_BC_SUBELEMENTS => array( 'bc' ),
-				),
-			),
+					ApiResult::META_BC_SUBELEMENTS => [ 'bc' ],
+				],
+			],
 
-			array(
+			[
 				'Types: Normal transform',
 				$typeArr,
-				array( 'Types' => array() ),
-				array(
-					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'defaultAssoc2' => array( 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'array' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCarray' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCassoc' => array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
-					'assoc' => array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'kvp' => array( 'x' => 'a', 'y' => 'b',
-						'z' => array( 'c', ApiResult::META_TYPE => 'array' ),
+				[ 'Types' => [] ],
+				[
+					'defaultArray' => [ 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ],
+					'defaultAssoc' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'defaultAssoc2' => [ 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'array' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCarray' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCassoc' => [ 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ],
+					'assoc' => [ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'kvp' => [ 'x' => 'a', 'y' => 'b',
+						'z' => [ 'c', ApiResult::META_TYPE => 'array' ],
 						ApiResult::META_TYPE => 'assoc'
-					),
-					'BCkvp' => array( 'x' => 'a', 'y' => 'b',
+					],
+					'BCkvp' => [ 'x' => 'a', 'y' => 'b',
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-					),
-					'kvpmerge' => array(
+					],
+					'kvpmerge' => [
 						'x' => 'a',
-						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
-						'z' => array( 'c' => 'd', ApiResult::META_TYPE => 'assoc' ),
+						'y' => [ 'b', ApiResult::META_TYPE => 'array' ],
+						'z' => [ 'c' => 'd', ApiResult::META_TYPE => 'assoc' ],
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_MERGE => true,
-					),
-					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
-					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+					],
+					'emptyDefault' => [ '_dummy' => 1, ApiResult::META_TYPE => 'array' ],
+					'emptyAssoc' => [ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 					'_dummy' => 1,
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
 					ApiResult::META_TYPE => 'assoc',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Types: AssocAsObject',
 				$typeArr,
-				array( 'Types' => array( 'AssocAsObject' => true ) ),
-				(object)array(
-					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => (object)array( 'x' => 'a',
+				[ 'Types' => [ 'AssocAsObject' => true ] ],
+				(object)[
+					'defaultArray' => [ 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ],
+					'defaultAssoc' => (object)[ 'x' => 'a',
 						1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc'
-					),
-					'defaultAssoc2' => (object)array( 2 => 'a', 3 => 'b',
+					],
+					'defaultAssoc2' => (object)[ 2 => 'a', 3 => 'b',
 						0 => 'c', ApiResult::META_TYPE => 'assoc'
-					),
-					'array' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCarray' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCassoc' => (object)array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
-					'assoc' => (object)array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'kvp' => (object)array( 'x' => 'a', 'y' => 'b',
-						'z' => array( 'c', ApiResult::META_TYPE => 'array' ),
+					],
+					'array' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCarray' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCassoc' => (object)[ 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ],
+					'assoc' => (object)[ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'kvp' => (object)[ 'x' => 'a', 'y' => 'b',
+						'z' => [ 'c', ApiResult::META_TYPE => 'array' ],
 						ApiResult::META_TYPE => 'assoc'
-					),
-					'BCkvp' => (object)array( 'x' => 'a', 'y' => 'b',
+					],
+					'BCkvp' => (object)[ 'x' => 'a', 'y' => 'b',
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-					),
-					'kvpmerge' => (object)array(
+					],
+					'kvpmerge' => (object)[
 						'x' => 'a',
-						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
-						'z' => (object)array( 'c' => 'd', ApiResult::META_TYPE => 'assoc' ),
+						'y' => [ 'b', ApiResult::META_TYPE => 'array' ],
+						'z' => (object)[ 'c' => 'd', ApiResult::META_TYPE => 'assoc' ],
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_MERGE => true,
-					),
-					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
-					'emptyAssoc' => (object)array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+					],
+					'emptyDefault' => [ '_dummy' => 1, ApiResult::META_TYPE => 'array' ],
+					'emptyAssoc' => (object)[ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 					'_dummy' => 1,
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
 					ApiResult::META_TYPE => 'assoc',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Types: ArmorKVP',
 				$typeArr,
-				array( 'Types' => array( 'ArmorKVP' => 'name' ) ),
-				array(
-					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'defaultAssoc2' => array( 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'array' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCarray' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCassoc' => array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
-					'assoc' => array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'kvp' => array(
+				[ 'Types' => [ 'ArmorKVP' => 'name' ] ],
+				[
+					'defaultArray' => [ 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ],
+					'defaultAssoc' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'defaultAssoc2' => [ 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'array' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCarray' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCassoc' => [ 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ],
+					'assoc' => [ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'kvp' => [
 						$kvp( 'name', 'x', 'value', 'a' ),
 						$kvp( 'name', 'y', 'value', 'b' ),
-						$kvp( 'name', 'z', 'value', array( 'c', ApiResult::META_TYPE => 'array' ) ),
+						$kvp( 'name', 'z', 'value', [ 'c', ApiResult::META_TYPE => 'array' ] ),
 						ApiResult::META_TYPE => 'array'
-					),
-					'BCkvp' => array(
+					],
+					'BCkvp' => [
 						$kvp( 'key', 'x', 'value', 'a' ),
 						$kvp( 'key', 'y', 'value', 'b' ),
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-					),
-					'kvpmerge' => array(
+					],
+					'kvpmerge' => [
 						$kvp( 'name', 'x', 'value', 'a' ),
-						$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-						array(
+						$kvp( 'name', 'y', 'value', [ 'b', ApiResult::META_TYPE => 'array' ] ),
+						[
 							'name' => 'z',
 							'c' => 'd',
 							ApiResult::META_TYPE => 'assoc',
-							ApiResult::META_PRESERVE_KEYS => array( 'name' )
-						),
+							ApiResult::META_PRESERVE_KEYS => [ 'name' ]
+						],
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_MERGE => true,
-					),
-					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
-					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+					],
+					'emptyDefault' => [ '_dummy' => 1, ApiResult::META_TYPE => 'array' ],
+					'emptyAssoc' => [ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 					'_dummy' => 1,
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
 					ApiResult::META_TYPE => 'assoc',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Types: ArmorKVP + BC',
 				$typeArr,
-				array( 'BC' => array(), 'Types' => array( 'ArmorKVP' => 'name' ) ),
-				array(
-					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'defaultAssoc2' => array( 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'array' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCarray' => array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'BCassoc' => array( 'a', 'b', 'c', ApiResult::META_TYPE => 'array' ),
-					'assoc' => array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'kvp' => array(
+				[ 'BC' => [], 'Types' => [ 'ArmorKVP' => 'name' ] ],
+				[
+					'defaultArray' => [ 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ],
+					'defaultAssoc' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'defaultAssoc2' => [ 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'array' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCarray' => [ 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'BCassoc' => [ 'a', 'b', 'c', ApiResult::META_TYPE => 'array' ],
+					'assoc' => [ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'kvp' => [
 						$kvp( 'name', 'x', '*', 'a' ),
 						$kvp( 'name', 'y', '*', 'b' ),
-						$kvp( 'name', 'z', '*', array( 'c', ApiResult::META_TYPE => 'array' ) ),
+						$kvp( 'name', 'z', '*', [ 'c', ApiResult::META_TYPE => 'array' ] ),
 						ApiResult::META_TYPE => 'array'
-					),
-					'BCkvp' => array(
+					],
+					'BCkvp' => [
 						$kvp( 'key', 'x', '*', 'a' ),
 						$kvp( 'key', 'y', '*', 'b' ),
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-					),
-					'kvpmerge' => array(
+					],
+					'kvpmerge' => [
 						$kvp( 'name', 'x', '*', 'a' ),
-						$kvp( 'name', 'y', '*', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-						array(
+						$kvp( 'name', 'y', '*', [ 'b', ApiResult::META_TYPE => 'array' ] ),
+						[
 							'name' => 'z',
 							'c' => 'd',
 							ApiResult::META_TYPE => 'assoc',
-							ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+							ApiResult::META_PRESERVE_KEYS => [ 'name' ] ],
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_MERGE => true,
-					),
-					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
-					'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+					],
+					'emptyDefault' => [ '_dummy' => 1, ApiResult::META_TYPE => 'array' ],
+					'emptyAssoc' => [ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 					'_dummy' => 1,
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
 					ApiResult::META_TYPE => 'assoc',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Types: ArmorKVP + AssocAsObject',
 				$typeArr,
-				array( 'Types' => array( 'ArmorKVP' => 'name', 'AssocAsObject' => true ) ),
-				(object)array(
-					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => (object)array( 'x' => 'a', 1 => 'b',
+				[ 'Types' => [ 'ArmorKVP' => 'name', 'AssocAsObject' => true ] ],
+				(object)[
+					'defaultArray' => [ 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ],
+					'defaultAssoc' => (object)[ 'x' => 'a', 1 => 'b',
 						0 => 'c', ApiResult::META_TYPE => 'assoc'
-					),
-					'defaultAssoc2' => (object)array( 2 => 'a', 3 => 'b',
+					],
+					'defaultAssoc2' => (object)[ 2 => 'a', 3 => 'b',
 						0 => 'c', ApiResult::META_TYPE => 'assoc'
-					),
-					'array' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCarray' => array( 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ),
-					'BCassoc' => (object)array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
-					'assoc' => (object)array( 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'kvp' => array(
+					],
+					'array' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCarray' => [ 'a', 'c', 'b', ApiResult::META_TYPE => 'array' ],
+					'BCassoc' => (object)[ 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ],
+					'assoc' => (object)[ 2 => 'a', 0 => 'b', 1 => 'c', ApiResult::META_TYPE => 'assoc' ],
+					'kvp' => [
 						(object)$kvp( 'name', 'x', 'value', 'a' ),
 						(object)$kvp( 'name', 'y', 'value', 'b' ),
-						(object)$kvp( 'name', 'z', 'value', array( 'c', ApiResult::META_TYPE => 'array' ) ),
+						(object)$kvp( 'name', 'z', 'value', [ 'c', ApiResult::META_TYPE => 'array' ] ),
 						ApiResult::META_TYPE => 'array'
-					),
-					'BCkvp' => array(
+					],
+					'BCkvp' => [
 						(object)$kvp( 'key', 'x', 'value', 'a' ),
 						(object)$kvp( 'key', 'y', 'value', 'b' ),
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
-					),
-					'kvpmerge' => array(
+					],
+					'kvpmerge' => [
 						(object)$kvp( 'name', 'x', 'value', 'a' ),
-						(object)$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-						(object)array(
+						(object)$kvp( 'name', 'y', 'value', [ 'b', ApiResult::META_TYPE => 'array' ] ),
+						(object)[
 							'name' => 'z',
 							'c' => 'd',
 							ApiResult::META_TYPE => 'assoc',
-							ApiResult::META_PRESERVE_KEYS => array( 'name' )
-						),
+							ApiResult::META_PRESERVE_KEYS => [ 'name' ]
+						],
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_MERGE => true,
-					),
-					'emptyDefault' => array( '_dummy' => 1, ApiResult::META_TYPE => 'array' ),
-					'emptyAssoc' => (object)array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
+					],
+					'emptyDefault' => [ '_dummy' => 1, ApiResult::META_TYPE => 'array' ],
+					'emptyAssoc' => (object)[ '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ],
 					'_dummy' => 1,
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy' ),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy' ],
 					ApiResult::META_TYPE => 'assoc',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Types: BCkvp exception',
-				array(
+				[
 					ApiResult::META_TYPE => 'BCkvp',
-				),
-				array( 'Types' => array() ),
+				],
+				[ 'Types' => [] ],
 				new UnexpectedValueException(
 					'Type "BCkvp" used without setting ApiResult::META_KVP_KEY_NAME metadata item'
 				),
-			),
+			],
 
-			array(
+			[
 				'Strip: With ArmorKVP + AssocAsObject transforms',
 				$typeArr,
-				array( 'Types' => array( 'ArmorKVP' => 'name', 'AssocAsObject' => true ), 'Strip' => 'all' ),
-				(object)array(
-					'defaultArray' => array( 'b', 'c', 'a' ),
-					'defaultAssoc' => (object)array( 'x' => 'a', 1 => 'b', 0 => 'c' ),
-					'defaultAssoc2' => (object)array( 2 => 'a', 3 => 'b', 0 => 'c' ),
-					'array' => array( 'a', 'c', 'b' ),
-					'BCarray' => array( 'a', 'c', 'b' ),
-					'BCassoc' => (object)array( 'a', 'b', 'c' ),
-					'assoc' => (object)array( 2 => 'a', 0 => 'b', 1 => 'c' ),
-					'kvp' => array(
-						(object)array( 'name' => 'x', 'value' => 'a' ),
-						(object)array( 'name' => 'y', 'value' => 'b' ),
-						(object)array( 'name' => 'z', 'value' => array( 'c' ) ),
-					),
-					'BCkvp' => array(
-						(object)array( 'key' => 'x', 'value' => 'a' ),
-						(object)array( 'key' => 'y', 'value' => 'b' ),
-					),
-					'kvpmerge' => array(
-						(object)array( 'name' => 'x', 'value' => 'a' ),
-						(object)array( 'name' => 'y', 'value' => array( 'b' ) ),
-						(object)array( 'name' => 'z', 'c' => 'd' ),
-					),
-					'emptyDefault' => array(),
-					'emptyAssoc' => (object)array(),
+				[ 'Types' => [ 'ArmorKVP' => 'name', 'AssocAsObject' => true ], 'Strip' => 'all' ],
+				(object)[
+					'defaultArray' => [ 'b', 'c', 'a' ],
+					'defaultAssoc' => (object)[ 'x' => 'a', 1 => 'b', 0 => 'c' ],
+					'defaultAssoc2' => (object)[ 2 => 'a', 3 => 'b', 0 => 'c' ],
+					'array' => [ 'a', 'c', 'b' ],
+					'BCarray' => [ 'a', 'c', 'b' ],
+					'BCassoc' => (object)[ 'a', 'b', 'c' ],
+					'assoc' => (object)[ 2 => 'a', 0 => 'b', 1 => 'c' ],
+					'kvp' => [
+						(object)[ 'name' => 'x', 'value' => 'a' ],
+						(object)[ 'name' => 'y', 'value' => 'b' ],
+						(object)[ 'name' => 'z', 'value' => [ 'c' ] ],
+					],
+					'BCkvp' => [
+						(object)[ 'key' => 'x', 'value' => 'a' ],
+						(object)[ 'key' => 'y', 'value' => 'b' ],
+					],
+					'kvpmerge' => [
+						(object)[ 'name' => 'x', 'value' => 'a' ],
+						(object)[ 'name' => 'y', 'value' => [ 'b' ] ],
+						(object)[ 'name' => 'z', 'c' => 'd' ],
+					],
+					'emptyDefault' => [],
+					'emptyAssoc' => (object)[],
 					'_dummy' => 1,
-				),
-			),
+				],
+			],
 
-			array(
+			[
 				'Strip: all',
 				$stripArr,
-				array( 'Strip' => 'all' ),
-				array(
-					'foo' => array(
-						'bar' => array(),
-						'baz' => array(),
+				[ 'Strip' => 'all' ],
+				[
+					'foo' => [
+						'bar' => [],
+						'baz' => [],
 						'x' => 'ok',
-					),
+					],
 					'_dummy2' => 'foobaz!',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Strip: base',
 				$stripArr,
-				array( 'Strip' => 'base' ),
-				array(
-					'foo' => array(
-						'bar' => array( '_dummy' => 'foobaz' ),
-						'baz' => array(
-							ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+				[ 'Strip' => 'base' ],
+				[
+					'foo' => [
+						'bar' => [ '_dummy' => 'foobaz' ],
+						'baz' => [
+							ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 							ApiResult::META_INDEXED_TAG_NAME => 'itn',
-							ApiResult::META_PRESERVE_KEYS => array( 'foo', 'bar', '_dummy2', 0 ),
+							ApiResult::META_PRESERVE_KEYS => [ 'foo', 'bar', '_dummy2', 0 ],
 							ApiResult::META_TYPE => 'array',
-						),
+						],
 						'x' => 'ok',
 						'_dummy' => 'foobaz',
-					),
+					],
 					'_dummy2' => 'foobaz!',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'Strip: bc',
 				$stripArr,
-				array( 'Strip' => 'bc' ),
-				array(
-					'foo' => array(
-						'bar' => array(),
-						'baz' => array(
-							ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+				[ 'Strip' => 'bc' ],
+				[
+					'foo' => [
+						'bar' => [],
+						'baz' => [
+							ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 							ApiResult::META_INDEXED_TAG_NAME => 'itn',
-						),
+						],
 						'x' => 'ok',
-					),
+					],
 					'_dummy2' => 'foobaz!',
-					ApiResult::META_SUBELEMENTS => array( 'foo', 'bar' ),
+					ApiResult::META_SUBELEMENTS => [ 'foo', 'bar' ],
 					ApiResult::META_INDEXED_TAG_NAME => 'itn',
-				),
-			),
+				],
+			],
 
-			array(
+			[
 				'Custom transform',
-				array(
+				[
 					'foo' => '?',
 					'bar' => '?',
 					'_dummy' => '?',
 					'_dummy2' => '?',
 					'_dummy3' => '?',
 					ApiResult::META_CONTENT => 'foo',
-					ApiResult::META_PRESERVE_KEYS => array( '_dummy2', '_dummy3' ),
-				),
-				array(
-					'Custom' => array( $this, 'customTransform' ),
-					'BC' => array(),
-					'Types' => array(),
+					ApiResult::META_PRESERVE_KEYS => [ '_dummy2', '_dummy3' ],
+				],
+				[
+					'Custom' => [ $this, 'customTransform' ],
+					'BC' => [],
+					'Types' => [],
 					'Strip' => 'all'
-				),
-				array(
+				],
+				[
 					'*' => 'FOO',
 					'bar' => 'BAR',
-					'baz' => array( 'a', 'b' ),
+					'baz' => [ 'a', 'b' ],
 					'_dummy2' => '_DUMMY2',
 					'_dummy3' => '_DUMMY3',
 					ApiResult::META_CONTENT => 'bar',
-				),
-			),
-		);
+				],
+			],
+		];
 
 	}
 
@@ -1248,7 +1248,7 @@ class ApiResultTest extends MediaWikiTestCase {
 		foreach ( $data as $k => $v ) {
 			$data[$k] = strtoupper( $k );
 		}
-		$data['baz'] = array( '_added' => 1, 'z' => 'b', 'y' => 'a' );
+		$data['baz'] = [ '_added' => 1, 'z' => 'b', 'y' => 'a' ];
 		$metadata[ApiResult::META_PRESERVE_KEYS][0] = '_dummy';
 		$data[ApiResult::META_CONTENT] = 'bar';
 	}
@@ -1257,70 +1257,70 @@ class ApiResultTest extends MediaWikiTestCase {
 	 * @covers ApiResult
 	 */
 	public function testAddMetadataToResultVars() {
-		$arr = array(
+		$arr = [
 			'a' => "foo",
 			'b' => false,
 			'c' => 10,
-			'sequential_numeric_keys' => array( 'a', 'b', 'c' ),
-			'non_sequential_numeric_keys' => array( 'a', 'b', 4 => 'c' ),
-			'string_keys' => array(
+			'sequential_numeric_keys' => [ 'a', 'b', 'c' ],
+			'non_sequential_numeric_keys' => [ 'a', 'b', 4 => 'c' ],
+			'string_keys' => [
 				'one' => 1,
 				'two' => 2
-			),
-			'object_sequential_keys' => (object)array( 'a', 'b', 'c' ),
+			],
+			'object_sequential_keys' => (object)[ 'a', 'b', 'c' ],
 			'_type' => "should be overwritten in result",
-		);
-		$this->assertSame( array(
+		];
+		$this->assertSame( [
 			ApiResult::META_TYPE => 'kvp',
 			ApiResult::META_KVP_KEY_NAME => 'key',
-			ApiResult::META_PRESERVE_KEYS => array(
+			ApiResult::META_PRESERVE_KEYS => [
 				'a', 'b', 'c',
 				'sequential_numeric_keys', 'non_sequential_numeric_keys',
 				'string_keys', 'object_sequential_keys'
-			),
-			ApiResult::META_BC_BOOLS => array( 'b' ),
+			],
+			ApiResult::META_BC_BOOLS => [ 'b' ],
 			ApiResult::META_INDEXED_TAG_NAME => 'var',
 			'a' => "foo",
 			'b' => false,
 			'c' => 10,
-			'sequential_numeric_keys' => array(
+			'sequential_numeric_keys' => [
 				ApiResult::META_TYPE => 'array',
-				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_BC_BOOLS => [],
 				ApiResult::META_INDEXED_TAG_NAME => 'value',
 				0 => 'a',
 				1 => 'b',
 				2 => 'c',
-			),
-			'non_sequential_numeric_keys' => array(
+			],
+			'non_sequential_numeric_keys' => [
 				ApiResult::META_TYPE => 'kvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
-				ApiResult::META_PRESERVE_KEYS => array( 0, 1, 4 ),
-				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_PRESERVE_KEYS => [ 0, 1, 4 ],
+				ApiResult::META_BC_BOOLS => [],
 				ApiResult::META_INDEXED_TAG_NAME => 'var',
 				0 => 'a',
 				1 => 'b',
 				4 => 'c',
-			),
-			'string_keys' => array(
+			],
+			'string_keys' => [
 				ApiResult::META_TYPE => 'kvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
-				ApiResult::META_PRESERVE_KEYS => array( 'one', 'two' ),
-				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_PRESERVE_KEYS => [ 'one', 'two' ],
+				ApiResult::META_BC_BOOLS => [],
 				ApiResult::META_INDEXED_TAG_NAME => 'var',
 				'one' => 1,
 				'two' => 2,
-			),
-			'object_sequential_keys' => array(
+			],
+			'object_sequential_keys' => [
 				ApiResult::META_TYPE => 'kvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
-				ApiResult::META_PRESERVE_KEYS => array( 0, 1, 2 ),
-				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_PRESERVE_KEYS => [ 0, 1, 2 ],
+				ApiResult::META_BC_BOOLS => [],
 				ApiResult::META_INDEXED_TAG_NAME => 'var',
 				0 => 'a',
 				1 => 'b',
 				2 => 'c',
-			),
-		), ApiResult::addMetadataToResultVars( $arr ) );
+			],
+		], ApiResult::addMetadataToResultVars( $arr ) );
 	}
 
 	/**
@@ -1341,11 +1341,11 @@ class ApiResultTest extends MediaWikiTestCase {
 		$reset = new ScopedCallback( 'restore_error_handler' );
 
 		$context = new DerivativeContext( RequestContext::getMain() );
-		$context->setConfig( new HashConfig( array(
-			'APIModules' => array(),
-			'APIFormatModules' => array(),
+		$context->setConfig( new HashConfig( [
+			'APIModules' => [],
+			'APIFormatModules' => [],
 			'APIMaxResultSize' => 42,
-		) ) );
+		] ) );
 		$main = new ApiMain( $context );
 		$result = TestingAccessWrapper::newFromObject( new ApiResult( $main ) );
 		$this->assertSame( 42, $result->maxSize );
@@ -1355,29 +1355,29 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result = new ApiResult( 8388608 );
 
 		$result->addContentValue( null, 'test', 'content' );
-		$result->addContentValue( array( 'foo', 'bar' ), 'test', 'content' );
+		$result->addContentValue( [ 'foo', 'bar' ], 'test', 'content' );
 		$result->addIndexedTagName( null, 'itn' );
-		$result->addSubelementsList( null, array( 'sub' ) );
-		$this->assertSame( array(
-			'foo' => array(
-				'bar' => array(
+		$result->addSubelementsList( null, [ 'sub' ] );
+		$this->assertSame( [
+			'foo' => [
+				'bar' => [
 					'*' => 'content',
-				),
-			),
+				],
+			],
 			'*' => 'content',
-		), $result->getData() );
+		], $result->getData() );
 
-		$arr = array();
+		$arr = [];
 		ApiResult::setContent( $arr, 'value' );
 		ApiResult::setContent( $arr, 'value2', 'foobar' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			ApiResult::META_CONTENT => 'content',
 			'content' => 'value',
-			'foobar' => array(
+			'foobar' => [
 				ApiResult::META_CONTENT => 'content',
 				'content' => 'value2',
-			),
-		), $arr );
+			],
+		], $arr );
 
 		$result = new ApiResult( 3 );
 		$formatter = new ApiErrorFormatter_BackCompat( $result );
@@ -1388,58 +1388,58 @@ class ApiResultTest extends MediaWikiTestCase {
 		$this->assertSame( 0, $result->getSize() );
 		$this->assertFalse( $result->addValue( null, 'foo', '1234567890' ) );
 
-		$arr = array( 'foo' => array( 'bar' => 1 ) );
+		$arr = [ 'foo' => [ 'bar' => 1 ] ];
 		$result->setIndexedTagName_recursive( $arr, 'itn' );
-		$this->assertSame( array(
-			'foo' => array(
+		$this->assertSame( [
+			'foo' => [
 				'bar' => 1,
 				ApiResult::META_INDEXED_TAG_NAME => 'itn'
-			),
-		), $arr );
+			],
+		], $arr );
 
 		$status = Status::newGood();
 		$status->fatal( 'parentheses', '1' );
 		$status->fatal( 'parentheses', '2' );
 		$status->warning( 'parentheses', '3' );
 		$status->warning( 'parentheses', '4' );
-		$this->assertSame( array(
-			array(
+		$this->assertSame( [
+			[
 				'type' => 'error',
 				'message' => 'parentheses',
-				'params' => array(
+				'params' => [
 					0 => '1',
 					ApiResult::META_INDEXED_TAG_NAME => 'param',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'type' => 'error',
 				'message' => 'parentheses',
-				'params' => array(
+				'params' => [
 					0 => '2',
 					ApiResult::META_INDEXED_TAG_NAME => 'param',
-				),
-			),
+				],
+			],
 			ApiResult::META_INDEXED_TAG_NAME => 'error',
-		), $result->convertStatusToArray( $status, 'error' ) );
-		$this->assertSame( array(
-			array(
+		], $result->convertStatusToArray( $status, 'error' ) );
+		$this->assertSame( [
+			[
 				'type' => 'warning',
 				'message' => 'parentheses',
-				'params' => array(
+				'params' => [
 					0 => '3',
 					ApiResult::META_INDEXED_TAG_NAME => 'param',
-				),
-			),
-			array(
+				],
+			],
+			[
 				'type' => 'warning',
 				'message' => 'parentheses',
-				'params' => array(
+				'params' => [
 					0 => '4',
 					ApiResult::META_INDEXED_TAG_NAME => 'param',
-				),
-			),
+				],
+			],
 			ApiResult::META_INDEXED_TAG_NAME => 'warning',
-		), $result->convertStatusToArray( $status, 'warning' ) );
+		], $result->convertStatusToArray( $status, 'warning' ) );
 	}
 
 	/**
@@ -1455,150 +1455,150 @@ class ApiResultTest extends MediaWikiTestCase {
 		} );
 
 		$reset = new ScopedCallback( 'restore_error_handler' );
-		$allModules = array(
+		$allModules = [
 			new MockApiQueryBase( 'mock1' ),
 			new MockApiQueryBase( 'mock2' ),
 			new MockApiQueryBase( 'mocklist' ),
-		);
+		];
 		$generator = new MockApiQueryBase( 'generator' );
 
 		$main = new ApiMain( RequestContext::getMain() );
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
-		$result->setContinueParam( $allModules[0], 'm1continue', array( 1, 2 ) );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
+		$result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] );
 		$result->setContinueParam( $allModules[2], 'mlcontinue', 2 );
 		$result->setGeneratorContinueParam( $generator, 'gcontinue', 3 );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'mlcontinue' => 2,
 			'm1continue' => '1|2',
 			'continue' => '||mock2',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( null, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mock1' => array( 'm1continue' => '1|2' ),
-			'mocklist' => array( 'mlcontinue' => 2 ),
-			'generator' => array( 'gcontinue' => 3 ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mock1' => [ 'm1continue' => '1|2' ],
+			'mocklist' => [ 'mlcontinue' => 2 ],
+			'generator' => [ 'gcontinue' => 3 ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
-		$result->setContinueParam( $allModules[0], 'm1continue', array( 1, 2 ) );
-		$result->setGeneratorContinueParam( $generator, 'gcontinue', array( 3, 4 ) );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
+		$result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] );
+		$result->setGeneratorContinueParam( $generator, 'gcontinue', [ 3, 4 ] );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'm1continue' => '1|2',
 			'continue' => '||mock2|mocklist',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( null, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mock1' => array( 'm1continue' => '1|2' ),
-			'generator' => array( 'gcontinue' => '3|4' ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mock1' => [ 'm1continue' => '1|2' ],
+			'generator' => [ 'gcontinue' => '3|4' ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
 		$result->setContinueParam( $allModules[2], 'mlcontinue', 2 );
 		$result->setGeneratorContinueParam( $generator, 'gcontinue', 3 );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'mlcontinue' => 2,
 			'gcontinue' => 3,
 			'continue' => 'gcontinue||',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( true, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mocklist' => array( 'mlcontinue' => 2 ),
-			'generator' => array( 'gcontinue' => 3 ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mocklist' => [ 'mlcontinue' => 2 ],
+			'generator' => [ 'gcontinue' => 3 ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
 		$result->setGeneratorContinueParam( $generator, 'gcontinue', 3 );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'gcontinue' => 3,
 			'continue' => 'gcontinue||mocklist',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( true, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'generator' => array( 'gcontinue' => 3 ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'generator' => [ 'gcontinue' => 3 ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
-		$result->setContinueParam( $allModules[0], 'm1continue', array( 1, 2 ) );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
+		$result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] );
 		$result->setContinueParam( $allModules[2], 'mlcontinue', 2 );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'mlcontinue' => 2,
 			'm1continue' => '1|2',
 			'continue' => '||mock2',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( null, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mock1' => array( 'm1continue' => '1|2' ),
-			'mocklist' => array( 'mlcontinue' => 2 ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mock1' => [ 'm1continue' => '1|2' ],
+			'mocklist' => [ 'mlcontinue' => 2 ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
-		$result->setContinueParam( $allModules[0], 'm1continue', array( 1, 2 ) );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
+		$result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'm1continue' => '1|2',
 			'continue' => '||mock2|mocklist',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( null, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mock1' => array( 'm1continue' => '1|2' ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mock1' => [ 'm1continue' => '1|2' ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
 		$result->setContinueParam( $allModules[2], 'mlcontinue', 2 );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'mlcontinue' => 2,
 			'continue' => '-||mock1|mock2',
-		), $result->getResultData( 'continue' ) );
+		], $result->getResultData( 'continue' ) );
 		$this->assertSame( true, $result->getResultData( 'batchcomplete' ) );
-		$this->assertSame( array(
-			'mocklist' => array( 'mlcontinue' => 2 ),
-		), $result->getResultData( 'query-continue' ) );
+		$this->assertSame( [
+			'mocklist' => [ 'mlcontinue' => 2 ],
+		], $result->getResultData( 'query-continue' ) );
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( null, $allModules, array( 'mock1', 'mock2' ) );
-		$this->assertSame( array( false, $allModules ), $ret );
+		$ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] );
+		$this->assertSame( [ false, $allModules ], $ret );
 		$result->endContinuation( 'raw' );
 		$result->endContinuation( 'standard' );
 		$this->assertSame( null, $result->getResultData( 'continue' ) );
@@ -1608,18 +1608,18 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( '||mock2', $allModules, array( 'mock1', 'mock2' ) );
+		$ret = $result->beginContinuation( '||mock2', $allModules, [ 'mock1', 'mock2' ] );
 		$this->assertSame(
-			array( false, array_values( array_diff_key( $allModules, array( 1 => 1 ) ) ) ),
+			[ false, array_values( array_diff_key( $allModules, [ 1 => 1 ] ) ) ],
 			$ret
 		);
 		$main->setContinuationManager( null );
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$ret = $result->beginContinuation( '-||', $allModules, array( 'mock1', 'mock2' ) );
+		$ret = $result->beginContinuation( '-||', $allModules, [ 'mock1', 'mock2' ] );
 		$this->assertSame(
-			array( true, array_values( array_diff_key( $allModules, array( 0 => 0, 1 => 1 ) ) ) ),
+			[ true, array_values( array_diff_key( $allModules, [ 0 => 0, 1 => 1 ] ) ) ],
 			$ret
 		);
 		$main->setContinuationManager( null );
@@ -1627,7 +1627,7 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
 		try {
-			$result->beginContinuation( 'foo', $allModules, array( 'mock1', 'mock2' ) );
+			$result->beginContinuation( 'foo', $allModules, [ 'mock1', 'mock2' ] );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UsageException $ex ) {
 			$this->assertSame(
@@ -1641,7 +1641,7 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
 		$result->beginContinuation( '||mock2', array_slice( $allModules, 0, 2 ),
-			array( 'mock1', 'mock2' ) );
+			[ 'mock1', 'mock2' ] );
 		try {
 			$result->setContinueParam( $allModules[1], 'm2continue', 1 );
 			$this->fail( 'Expected exception not thrown' );
@@ -1668,24 +1668,24 @@ class ApiResultTest extends MediaWikiTestCase {
 	}
 
 	public function testObjectSerialization() {
-		$arr = array();
-		ApiResult::setValue( $arr, 'foo', (object)array( 'a' => 1, 'b' => 2 ) );
-		$this->assertSame( array(
+		$arr = [];
+		ApiResult::setValue( $arr, 'foo', (object)[ 'a' => 1, 'b' => 2 ] );
+		$this->assertSame( [
 			'a' => 1,
 			'b' => 2,
 			ApiResult::META_TYPE => 'assoc',
-		), $arr['foo'] );
+		], $arr['foo'] );
 
-		$arr = array();
+		$arr = [];
 		ApiResult::setValue( $arr, 'foo', new ApiResultTestStringifiableObject() );
 		$this->assertSame( 'Ok', $arr['foo'] );
 
-		$arr = array();
+		$arr = [];
 		ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject( 'Ok' ) );
 		$this->assertSame( 'Ok', $arr['foo'] );
 
 		try {
-			$arr = array();
+			$arr = [];
 			ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject(
 				new ApiResultTestStringifiableObject()
 			) );
@@ -1700,7 +1700,7 @@ class ApiResultTest extends MediaWikiTestCase {
 		}
 
 		try {
-			$arr = array();
+			$arr = [];
 			ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject( NAN ) );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
@@ -1712,17 +1712,17 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
-		$arr = array();
+		$arr = [];
 		ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject(
-			array(
+			[
 				'one' => new ApiResultTestStringifiableObject( '1' ),
 				'two' => new ApiResultTestSerializableObject( 2 ),
-			)
+			]
 		) );
-		$this->assertSame( array(
+		$this->assertSame( [
 			'one' => '1',
 			'two' => 2,
-		), $arr['foo'] );
+		], $arr['foo'] );
 	}
 
 }