X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2Fformat%2FApiFormatPhpTest.php;h=0028bbb0ace82a616574e597eab4c14381684c57;hb=81100ad05b6681b46035d22a7fcdf8457dbf45ea;hp=09c7c0ce59f64e65dd0d573b170b0a839bf78015;hpb=271da8812794176ce928978b77dbd2a6381d8193;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
index 09c7c0ce59..0028bbb0ac 100644
--- a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
@@ -11,7 +11,7 @@ class ApiFormatPhpTest extends ApiFormatTestBase {
 	private static function addFormatVersion( $format, $arr ) {
 		foreach ( $arr as &$p ) {
 			if ( !isset( $p[2] ) ) {
-				$p[2] = array( 'formatversion' => $format );
+				$p[2] = [ 'formatversion' => $format ];
 			} else {
 				$p[2]['formatversion'] = $format;
 			}
@@ -20,91 +20,93 @@ class ApiFormatPhpTest extends ApiFormatTestBase {
 	}
 
 	public static function provideGeneralEncoding() {
+		// @codingStandardsIgnoreStart Generic.Files.LineLength
 		return array_merge(
-			self::addFormatVersion( 1, array(
+			self::addFormatVersion( 1, [
 				// Basic types
-				array( array( null ), 'a:1:{i:0;N;}' ),
-				array( array( true ), 'a:1:{i:0;s:0:"";}' ),
-				array( array( false ), 'a:0:{}' ),
-				array( array( true, ApiResult::META_BC_BOOLS => array( 0 ) ),
-					'a:1:{i:0;b:1;}' ),
-				array( array( false, ApiResult::META_BC_BOOLS => array( 0 ) ),
-					'a:1:{i:0;b:0;}' ),
-				array( array( 42 ), 'a:1:{i:0;i:42;}' ),
-				array( array( 42.5 ), 'a:1:{i:0;d:42.5;}' ),
-				array( array( 1e42 ), 'a:1:{i:0;d:1.0E+42;}' ),
-				array( array( 'foo' ), 'a:1:{i:0;s:3:"foo";}' ),
-				array( array( 'fóo' ), 'a:1:{i:0;s:4:"fóo";}' ),
+				[ [ null ], 'a:1:{i:0;N;}' ],
+				[ [ true ], 'a:1:{i:0;s:0:"";}' ],
+				[ [ false ], 'a:0:{}' ],
+				[ [ true, ApiResult::META_BC_BOOLS => [ 0 ] ],
+					'a:1:{i:0;b:1;}' ],
+				[ [ false, ApiResult::META_BC_BOOLS => [ 0 ] ],
+					'a:1:{i:0;b:0;}' ],
+				[ [ 42 ], 'a:1:{i:0;i:42;}' ],
+				[ [ 42.5 ], 'a:1:{i:0;d:42.5;}' ],
+				[ [ 1e42 ], 'a:1:{i:0;d:1.0E+42;}' ],
+				[ [ 'foo' ], 'a:1:{i:0;s:3:"foo";}' ],
+				[ [ 'fóo' ], 'a:1:{i:0;s:4:"fóo";}' ],
 
 				// Arrays and objects
-				array( array( array() ), 'a:1:{i:0;a:0:{}}' ),
-				array( array( array( 1 ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1 ) ), 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 2 => 1 ) ), 'a:1:{i:0;a:1:{i:2;i:1;}}' ),
-				array( array( (object)array() ), 'a:1:{i:0;a:0:{}}' ),
-				array( array( array( 1, ApiResult::META_TYPE => 'assoc' ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'array' ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'kvp' ) ), 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ) ),
-					'a:1:{i:0;a:1:{i:0;a:2:{s:3:"key";s:1:"x";s:1:"*";i:1;}}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCarray' ) ), 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ) ), 'a:1:{i:0;a:2:{i:0;s:1:"a";i:1;s:1:"b";}}' ),
+				[ [ [] ], 'a:1:{i:0;a:0:{}}' ],
+				[ [ [ 1 ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1 ] ], 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 2 => 1 ] ], 'a:1:{i:0;a:1:{i:2;i:1;}}' ],
+				[ [ (object)[] ], 'a:1:{i:0;a:0:{}}' ],
+				[ [ [ 1, ApiResult::META_TYPE => 'assoc' ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'array' ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'kvp' ] ], 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ] ],
+					'a:1:{i:0;a:1:{i:0;a:2:{s:3:"key";s:1:"x";s:1:"*";i:1;}}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'BCarray' ] ], 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ] ], 'a:1:{i:0;a:2:{i:0;s:1:"a";i:1;s:1:"b";}}' ],
 
 				// Content
-				array( array( 'content' => 'foo', ApiResult::META_CONTENT => 'content' ),
-					'a:1:{s:1:"*";s:3:"foo";}' ),
+				[ [ 'content' => 'foo', ApiResult::META_CONTENT => 'content' ],
+					'a:1:{s:1:"*";s:3:"foo";}' ],
 
 				// BC Subelements
-				array( array( 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => array( 'foo' ) ),
-					'a:1:{s:3:"foo";a:1:{s:1:"*";s:3:"foo";}}' ),
-			) ),
-			self::addFormatVersion( 2, array(
+				[ [ 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => [ 'foo' ] ],
+					'a:1:{s:3:"foo";a:1:{s:1:"*";s:3:"foo";}}' ],
+			] ),
+			self::addFormatVersion( 2, [
 				// Basic types
-				array( array( null ), 'a:1:{i:0;N;}' ),
-				array( array( true ), 'a:1:{i:0;b:1;}' ),
-				array( array( false ), 'a:1:{i:0;b:0;}' ),
-				array( array( true, ApiResult::META_BC_BOOLS => array( 0 ) ),
-					'a:1:{i:0;b:1;}' ),
-				array( array( false, ApiResult::META_BC_BOOLS => array( 0 ) ),
-					'a:1:{i:0;b:0;}' ),
-				array( array( 42 ), 'a:1:{i:0;i:42;}' ),
-				array( array( 42.5 ), 'a:1:{i:0;d:42.5;}' ),
-				array( array( 1e42 ), 'a:1:{i:0;d:1.0E+42;}' ),
-				array( array( 'foo' ), 'a:1:{i:0;s:3:"foo";}' ),
-				array( array( 'fóo' ), 'a:1:{i:0;s:4:"fóo";}' ),
+				[ [ null ], 'a:1:{i:0;N;}' ],
+				[ [ true ], 'a:1:{i:0;b:1;}' ],
+				[ [ false ], 'a:1:{i:0;b:0;}' ],
+				[ [ true, ApiResult::META_BC_BOOLS => [ 0 ] ],
+					'a:1:{i:0;b:1;}' ],
+				[ [ false, ApiResult::META_BC_BOOLS => [ 0 ] ],
+					'a:1:{i:0;b:0;}' ],
+				[ [ 42 ], 'a:1:{i:0;i:42;}' ],
+				[ [ 42.5 ], 'a:1:{i:0;d:42.5;}' ],
+				[ [ 1e42 ], 'a:1:{i:0;d:1.0E+42;}' ],
+				[ [ 'foo' ], 'a:1:{i:0;s:3:"foo";}' ],
+				[ [ 'fóo' ], 'a:1:{i:0;s:4:"fóo";}' ],
 
 				// Arrays and objects
-				array( array( array() ), 'a:1:{i:0;a:0:{}}' ),
-				array( array( array( 1 ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1 ) ), 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 2 => 1 ) ), 'a:1:{i:0;a:1:{i:2;i:1;}}' ),
-				array( array( (object)array() ), 'a:1:{i:0;a:0:{}}' ),
-				array( array( array( 1, ApiResult::META_TYPE => 'assoc' ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'array' ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'kvp' ) ), 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ) ),
-					'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ),
-				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCarray' ) ), 'a:1:{i:0;a:1:{i:0;i:1;}}' ),
-				array( array( array( 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ) ), 'a:1:{i:0;a:2:{i:0;s:1:"a";i:1;s:1:"b";}}' ),
+				[ [ [] ], 'a:1:{i:0;a:0:{}}' ],
+				[ [ [ 1 ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1 ] ], 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 2 => 1 ] ], 'a:1:{i:0;a:1:{i:2;i:1;}}' ],
+				[ [ (object)[] ], 'a:1:{i:0;a:0:{}}' ],
+				[ [ [ 1, ApiResult::META_TYPE => 'assoc' ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'array' ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'kvp' ] ], 'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ] ],
+					'a:1:{i:0;a:1:{s:1:"x";i:1;}}' ],
+				[ [ [ 'x' => 1, ApiResult::META_TYPE => 'BCarray' ] ], 'a:1:{i:0;a:1:{i:0;i:1;}}' ],
+				[ [ [ 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ] ], 'a:1:{i:0;a:2:{i:0;s:1:"a";i:1;s:1:"b";}}' ],
 
 				// Content
-				array( array( 'content' => 'foo', ApiResult::META_CONTENT => 'content' ),
-					'a:1:{s:7:"content";s:3:"foo";}' ),
+				[ [ 'content' => 'foo', ApiResult::META_CONTENT => 'content' ],
+					'a:1:{s:7:"content";s:3:"foo";}' ],
 
 				// BC Subelements
-				array( array( 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => array( 'foo' ) ),
-					'a:1:{s:3:"foo";s:3:"foo";}' ),
-			) )
+				[ [ 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => [ 'foo' ] ],
+					'a:1:{s:3:"foo";s:3:"foo";}' ],
+			] )
 		);
+		// @codingStandardsIgnoreEnd
 	}
 
 	public function testCrossDomainMangling() {
-		$config = new HashConfig( array( 'MangleFlashPolicy' => false ) );
+		$config = new HashConfig( [ 'MangleFlashPolicy' => false ] );
 		$context = new RequestContext;
-		$context->setConfig( new MultiConfig( array(
+		$context->setConfig( new MultiConfig( [
 			$config,
 			$context->getConfig(),
-		) ) );
+		] ) );
 		$main = new ApiMain( $context );
 		$main->getResult()->addValue( null, null, '< Cross-Domain-Policy >' );
 
@@ -134,7 +136,8 @@ class ApiFormatPhpTest extends ApiFormatTestBase {
 		} catch ( UsageException $ex ) {
 			ob_end_clean();
 			$this->assertSame(
-				'This response cannot be represented using format=php. See https://phabricator.wikimedia.org/T68776',
+				'This response cannot be represented using format=php. ' .
+					'See https://phabricator.wikimedia.org/T68776',
 				$ex->getMessage(),
 				'Expected exception'
 			);