X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fjson%2FFormatJsonTest.php;h=2760cb9f22906f6f27ea09745c8b3198f6561a90;hb=d79f256590243e52c8bebd3ad635c73b8abb0498;hp=d252c807324050e1fb78a423c2c993bdf40a68e4;hpb=5faa70e0f8d907385b4aecf209a1123b2df659c4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/json/FormatJsonTest.php b/tests/phpunit/includes/json/FormatJsonTest.php
index d252c80732..2760cb9f22 100644
--- a/tests/phpunit/includes/json/FormatJsonTest.php
+++ b/tests/phpunit/includes/json/FormatJsonTest.php
@@ -159,12 +159,12 @@ class FormatJsonTest extends MediaWikiTestCase {
 		$this->assertJson( $json );
 
 		$st = FormatJson::parse( $json );
-		$this->assertInstanceOf( 'Status', $st );
+		$this->assertInstanceOf( Status::class, $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $expected, $st->getValue() );
 
 		$st = FormatJson::parse( $json, FormatJson::FORCE_ASSOC );
-		$this->assertInstanceOf( 'Status', $st );
+		$this->assertInstanceOf( Status::class, $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $value, $st->getValue() );
 	}
@@ -172,7 +172,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 	/**
 	 * Test data for testParseTryFixing.
 	 *
-	 * Some PHP interpreters use json-c rather than the JSON.org cannonical
+	 * Some PHP interpreters use json-c rather than the JSON.org canonical
 	 * parser to avoid being encumbered by the "shall be used for Good, not
 	 * Evil" clause of the JSON.org parser's license. By default, json-c
 	 * parses in a non-strict mode which allows trailing commas for array and
@@ -230,7 +230,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 		}
 
 		$st = FormatJson::parse( $value, FormatJson::TRY_FIXING );
-		$this->assertInstanceOf( 'Status', $st );
+		$this->assertInstanceOf( Status::class, $st );
 		if ( $expected === false ) {
 			$this->assertFalse( $st->isOK(), 'Expected isOK() == false' );
 		} else {
@@ -256,7 +256,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 	 */
 	public function testParseErrors( $value ) {
 		$st = FormatJson::parse( $value );
-		$this->assertInstanceOf( 'Status', $st );
+		$this->assertInstanceOf( Status::class, $st );
 		$this->assertFalse( $st->isOK() );
 	}
 
@@ -313,7 +313,7 @@ class FormatJsonTest extends MediaWikiTestCase {
 	 */
 	public function testParseStripComments( $json, $expect ) {
 		$st = FormatJson::parse( $json, FormatJson::STRIP_COMMENTS );
-		$this->assertInstanceOf( 'Status', $st );
+		$this->assertInstanceOf( Status::class, $st );
 		$this->assertTrue( $st->isGood() );
 		$this->assertEquals( $expect, $st->getValue() );
 	}
@@ -372,4 +372,56 @@ class FormatJsonTest extends MediaWikiTestCase {
 
 		return $cases;
 	}
+
+	public function provideEmptyJsonKeyStrings() {
+		return [
+			[
+				'{"":"foo"}',
+				'{"":"foo"}',
+				''
+			],
+			[
+				'{"_empty_":"foo"}',
+				'{"_empty_":"foo"}',
+				'_empty_' ],
+			[
+				'{"\u005F\u0065\u006D\u0070\u0074\u0079\u005F":"foo"}',
+				'{"_empty_":"foo"}',
+				'_empty_'
+			],
+			[
+				'{"_empty_":"bar","":"foo"}',
+				'{"_empty_":"bar","":"foo"}',
+				''
+			],
+			[
+				'{"":"bar","_empty_":"foo"}',
+				'{"":"bar","_empty_":"foo"}',
+				'_empty_'
+			]
+		];
+	}
+
+	/**
+	 * @covers FormatJson::encode
+	 * @covers FormatJson::decode
+	 * @dataProvider provideEmptyJsonKeyStrings
+	 * @param string $json
+	 *
+	 * Decoding behavior with empty keys can be surprising.
+	 * See https://phabricator.wikimedia.org/T206411
+	 */
+	public function testEmptyJsonKeyArray( $json, $expect, $php71Name ) {
+		// Decoding to array is consistent across supported PHP versions
+		$this->assertSame( $expect, FormatJson::encode(
+			FormatJson::decode( $json, true ) ) );
+
+		// Decoding to object differs between supported PHP versions
+		$obj = FormatJson::decode( $json );
+		if ( version_compare( PHP_VERSION, '7.1', '<' ) ) {
+			$this->assertEquals( 'foo', $obj->_empty_ );
+		} else {
+			$this->assertEquals( 'foo', $obj->{$php71Name} );
+		}
+	}
 }