Update to MediaWiki 1.26.0

1 files changed, 171 insertions, 23 deletions

diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index f0d84552..2f31677e 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -181,6 +181,19 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
+		ApiResult::setValue( $arr, null, NAN, ApiResult::NO_VALIDATE );
+
+		try {
+			ApiResult::setValue( $arr, null, NAN, ApiResult::NO_SIZE_CHECK );
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( InvalidArgumentException $ex ) {
+			$this->assertSame(
+				'Cannot add non-finite floats to ApiResult',
+				$ex->getMessage(),
+				'Expected exception'
+			);
+		}
+
 		$arr = array();
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
@@ -408,6 +421,19 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
+		$result->addValue( null, null, NAN, ApiResult::NO_VALIDATE );
+
+		try {
+			$result->addValue( null, null, NAN, ApiResult::NO_SIZE_CHECK );
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( InvalidArgumentException $ex ) {
+			$this->assertSame(
+				'Cannot add non-finite floats to ApiResult',
+				$ex->getMessage(),
+				'Expected exception'
+			);
+		}
+
 		$result->reset();
 		$result->addParsedLimit( 'foo', 12 );
 		$this->assertSame( array(
@@ -444,6 +470,12 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result->removeValue( null, 'foo' );
 		$this->assertTrue( $result->addValue( null, 'foo', '1' ) );
 
+		$result = new ApiResult( 10 );
+		$obj = new ApiResultTestSerializableObject( 'ok' );
+		$obj->foobar = 'foobaz';
+		$this->assertTrue( $result->addValue( null, 'foo', $obj ) );
+		$this->assertSame( 2, $result->getSize() );
+
 		$result = new ApiResult( 8388608 );
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
@@ -674,6 +706,10 @@ class ApiResultTest extends MediaWikiTestCase {
 				ApiResult::META_TYPE => 'BCkvp',
 				ApiResult::META_KVP_KEY_NAME => 'key',
 			),
+			'kvpmerge' => array( 'x' => 'a', 'y' => array( 'b' ), 'z' => array( 'c' => 'd' ),
+				ApiResult::META_TYPE => 'kvp',
+				ApiResult::META_KVP_MERGE => true,
+			),
 			'emptyDefault' => array( '_dummy' => 1 ),
 			'emptyAssoc' => array( '_dummy' => 1, ApiResult::META_TYPE => 'assoc' ),
 			'_dummy' => 1,
@@ -858,6 +894,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						'x' => 'a',
+						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
+						'z' => array( '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' ),
 					'_dummy' => 1,
@@ -871,8 +914,12 @@ class ApiResultTest extends MediaWikiTestCase {
 				array( 'Types' => array( 'AssocAsObject' => true ) ),
 				(object)array(
 					'defaultArray' => array( 'b', 'c', 'a', ApiResult::META_TYPE => 'array' ),
-					'defaultAssoc' => (object)array( 'x' => 'a', 1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'defaultAssoc2' => (object)array( 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
+					'defaultAssoc' => (object)array( 'x' => 'a',
+						1 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc'
+					),
+					'defaultAssoc2' => (object)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' => (object)array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
@@ -885,6 +932,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'assoc',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => (object)array(
+						'x' => 'a',
+						'y' => array( 'b', ApiResult::META_TYPE => 'array' ),
+						'z' => (object)array( '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' ),
 					'_dummy' => 1,
@@ -916,6 +970,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						$kvp( 'name', 'x', 'value', 'a' ),
+						$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( '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' ),
 					'_dummy' => 1,
@@ -947,6 +1008,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						$kvp( 'name', 'x', '*', 'a' ),
+						$kvp( 'name', 'y', '*', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( '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' ),
 					'_dummy' => 1,
@@ -960,8 +1028,12 @@ class ApiResultTest extends MediaWikiTestCase {
 				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', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
-					'defaultAssoc2' => (object)array( 2 => 'a', 3 => 'b', 0 => 'c', ApiResult::META_TYPE => 'assoc' ),
+					'defaultAssoc' => (object)array( 'x' => 'a', 1 => 'b',
+						0 => 'c', ApiResult::META_TYPE => 'assoc'
+					),
+					'defaultAssoc2' => (object)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' => (object)array( 'a', 'b', 'c', ApiResult::META_TYPE => 'assoc' ),
@@ -978,6 +1050,13 @@ class ApiResultTest extends MediaWikiTestCase {
 						ApiResult::META_TYPE => 'array',
 						ApiResult::META_KVP_KEY_NAME => 'key',
 					),
+					'kvpmerge' => array(
+						(object)$kvp( 'name', 'x', 'value', 'a' ),
+						(object)$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
+						(object)array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( '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' ),
 					'_dummy' => 1,
@@ -1017,6 +1096,11 @@ class ApiResultTest extends MediaWikiTestCase {
 						(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(),
 					'_dummy' => 1,
@@ -1127,13 +1211,84 @@ class ApiResultTest extends MediaWikiTestCase {
 	/**
 	 * @covers ApiResult
 	 */
+	public function testAddMetadataToResultVars() {
+		$arr = array(
+			'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(
+				'one' => 1,
+				'two' => 2
+			),
+			'object_sequential_keys' => (object)array( 'a', 'b', 'c' ),
+			'_type' => "should be overwritten in result",
+		);
+		$this->assertSame( array(
+			ApiResult::META_TYPE => 'kvp',
+			ApiResult::META_KVP_KEY_NAME => 'key',
+			ApiResult::META_PRESERVE_KEYS => array(
+				'a', 'b', 'c',
+				'sequential_numeric_keys', 'non_sequential_numeric_keys',
+				'string_keys', 'object_sequential_keys'
+			),
+			ApiResult::META_BC_BOOLS => array( 'b' ),
+			ApiResult::META_INDEXED_TAG_NAME => 'var',
+			'a' => "foo",
+			'b' => false,
+			'c' => 10,
+			'sequential_numeric_keys' => array(
+				ApiResult::META_TYPE => 'array',
+				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_INDEXED_TAG_NAME => 'value',
+				0 => 'a',
+				1 => 'b',
+				2 => 'c',
+			),
+			'non_sequential_numeric_keys' => array(
+				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_INDEXED_TAG_NAME => 'var',
+				0 => 'a',
+				1 => 'b',
+				4 => 'c',
+			),
+			'string_keys' => array(
+				ApiResult::META_TYPE => 'kvp',
+				ApiResult::META_KVP_KEY_NAME => 'key',
+				ApiResult::META_PRESERVE_KEYS => array( 'one', 'two' ),
+				ApiResult::META_BC_BOOLS => array(),
+				ApiResult::META_INDEXED_TAG_NAME => 'var',
+				'one' => 1,
+				'two' => 2,
+			),
+			'object_sequential_keys' => array(
+				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_INDEXED_TAG_NAME => 'var',
+				0 => 'a',
+				1 => 'b',
+				2 => 'c',
+			),
+		), ApiResult::addMetadataToResultVars( $arr ) );
+	}
+
+	/**
+	 * @covers ApiResult
+	 */
 	public function testDeprecatedFunctions() {
 		// Ignore ApiResult deprecation warnings during this test
 		set_error_handler( function ( $errno, $errstr ) use ( &$warnings ) {
 			if ( preg_match( '/Use of ApiResult::\S+ was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) {
 				return true;
 			}
-			if ( preg_match( '/Use of ApiMain to ApiResult::__construct was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) {
+			if ( preg_match( '/Use of ApiMain to ApiResult::__construct ' .
+				'was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) {
 				return true;
 			}
 			return false;
@@ -1166,17 +1321,6 @@ class ApiResultTest extends MediaWikiTestCase {
 			),
 			'*' => 'content',
 		), $result->getData() );
-		$result->setRawMode();
-		$this->assertSame( array(
-			'foo' => array(
-				'bar' => array(
-					'*' => 'content',
-				),
-			),
-			'*' => 'content',
-			'_element' => 'itn',
-			'_subelements' => array( 'sub' ),
-		), $result->getData() );
 
 		$arr = array();
 		ApiResult::setContent( $arr, 'value' );
@@ -1451,7 +1595,8 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		$result = new ApiResult( 8388608 );
 		$result->setMainForContinuation( $main );
-		$result->beginContinuation( '||mock2', array_slice( $allModules, 0, 2 ), array( 'mock1', 'mock2' ) );
+		$result->beginContinuation( '||mock2', array_slice( $allModules, 0, 2 ),
+			array( 'mock1', 'mock2' ) );
 		try {
 			$result->setContinueParam( $allModules[1], 'm2continue', 1 );
 			$this->fail( 'Expected exception not thrown' );
@@ -1467,7 +1612,8 @@ class ApiResultTest extends MediaWikiTestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'Module \'mocklist\' called ApiContinuationManager::addContinueParam but was not passed to ApiContinuationManager::__construct',
+				'Module \'mocklist\' called ApiContinuationManager::addContinueParam ' .
+					'but was not passed to ApiContinuationManager::__construct',
 				$ex->getMessage(),
 				'Expected exception'
 			);
@@ -1495,13 +1641,14 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		try {
 			$arr = array();
-			ApiResult::setValue( $arr, 'foo',  new ApiResultTestSerializableObject(
+			ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject(
 				new ApiResultTestStringifiableObject()
 			) );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'ApiResultTestSerializableObject::serializeForApiResult() returned an object of class ApiResultTestStringifiableObject',
+				'ApiResultTestSerializableObject::serializeForApiResult() ' .
+					'returned an object of class ApiResultTestStringifiableObject',
 				$ex->getMessage(),
 				'Expected exception'
 			);
@@ -1509,18 +1656,19 @@ class ApiResultTest extends MediaWikiTestCase {
 
 		try {
 			$arr = array();
-			ApiResult::setValue( $arr, 'foo',  new ApiResultTestSerializableObject( NAN ) );
+			ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject( NAN ) );
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'ApiResultTestSerializableObject::serializeForApiResult() returned an invalid value: Cannot add non-finite floats to ApiResult',
+				'ApiResultTestSerializableObject::serializeForApiResult() ' .
+					'returned an invalid value: Cannot add non-finite floats to ApiResult',
 				$ex->getMessage(),
 				'Expected exception'
 			);
 		}
 
 		$arr = array();
-		ApiResult::setValue( $arr, 'foo',  new ApiResultTestSerializableObject(
+		ApiResult::setValue( $arr, 'foo', new ApiResultTestSerializableObject(
 			array(
 				'one' => new ApiResultTestStringifiableObject( '1' ),
 				'two' => new ApiResultTestSerializableObject( 2 ),