Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197383
Change subject: Update ApiResult handling for mediawiki/core change I7b37295e
......................................................................
Update ApiResult handling for mediawiki/core change I7b37295e
Change I7b37295e8862b188d1f3b0cd07f66ac34629678f for mediawiki/core
deprecates several methods, and more importantly changes the format of
the data returned from ApiResult::getData(). This change should handle
these differences in a backwards-compatible manner.
This leaves calls to ApiResult::getIsRawMode() and
ApiResult::setRawMode() to be cleaned up.
Bug: T91073
Change-Id: I847a4a5a1c927cdad2b02c030e85fbf2ca8e549b
---
M client/includes/api/PageTerms.php
M client/tests/phpunit/includes/api/ApiClientInfoTest.php
M client/tests/phpunit/includes/api/PageTermsTest.php
M repo/includes/api/ApiErrorReporter.php
M repo/includes/api/GetEntities.php
M repo/includes/api/ResultBuilder.php
M repo/includes/api/SearchEntities.php
M repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
M repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
M repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
12 files changed, 268 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/197383/1
diff --git a/client/includes/api/PageTerms.php
b/client/includes/api/PageTerms.php
index d8f7c5b..17b45db 100644
--- a/client/includes/api/PageTerms.php
+++ b/client/includes/api/PageTerms.php
@@ -218,7 +218,11 @@
* @return bool True if it fits in the result
*/
private function addTermsForPage( ApiResult $result, $pageId, array
$termsByType ) {
- $result->setIndexedTagName_recursive( $termsByType, 'term' );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ ApiResult::setIndexedTagNameOnSubarrays( $termsByType,
'term' );
+ } else {
+ $result->setIndexedTagName_recursive( $termsByType,
'term' );
+ }
$fit = $result->addValue( array( 'query', 'pages', $pageId ),
'terms', $termsByType );
diff --git a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
index 66dc746..3f03964 100644
--- a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
+++ b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
@@ -66,7 +66,11 @@
$module = $this->getApiModule( $params, $settings );
$module->execute();
- $result = $module->getResult()->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $result = $module->getResult()->getResultData();
+ } else {
+ $result = $module->getResult()->getData();
+ }
$this->assertInternalType( 'array', $result, 'top level element
is an array' );
diff --git a/client/tests/phpunit/includes/api/PageTermsTest.php
b/client/tests/phpunit/includes/api/PageTermsTest.php
index fe6124f..8194af3 100644
--- a/client/tests/phpunit/includes/api/PageTermsTest.php
+++ b/client/tests/phpunit/includes/api/PageTermsTest.php
@@ -237,7 +237,15 @@
$module->execute();
$result = $module->getResult();
- return $result->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ return $data;
}
public function pageTermsProvider() {
diff --git a/repo/includes/api/ApiErrorReporter.php
b/repo/includes/api/ApiErrorReporter.php
index 311852d..64f79f5 100644
--- a/repo/includes/api/ApiErrorReporter.php
+++ b/repo/includes/api/ApiErrorReporter.php
@@ -308,13 +308,17 @@
$messageData = $this->convertMessageToResult( $message );
- $res = $this->apiModule->getResult();
-
$messageList = isset( $data['messages'] ) ? $data['messages'] :
array();
- $res->setIndexedTagName( $messageList, 'message' );
-
$messageList[] = $messageData;
- $res->setElement( $data, 'messages', $messageList,
ApiResult::OVERRIDE );
+
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ ApiResult::setIndexedTagName( $messageList, 'message' );
+ ApiResult::setValue( $data, 'messages', $messageList,
ApiResult::OVERRIDE );
+ } else {
+ $res = $this->apiModule->getResult();
+ $res->setIndexedTagName( $messageList, 'message' );
+ ApiResult::setElement( $data, 'messages', $messageList,
ApiResult::OVERRIDE );
+ }
}
/**
@@ -365,7 +369,6 @@
*/
private function convertMessagesToResult( array $messageSpecs ) {
$result = array();
- $res = $this->apiModule->getResult();
foreach ( $messageSpecs as $message ) {
$type = null;
@@ -385,12 +388,17 @@
$row = $this->convertMessageToResult( $message );
if ( $type !== null ) {
- $res->setElement( $row, 'type', $type );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ ApiResult::setValue( $row, 'type',
$type );
+ } else {
+ ApiResult::setElement( $row, 'type',
$type );
+ }
}
$result[] = $row;
}
+ $res = $this->apiModule->getResult();
$res->setIndexedTagName( $result, 'message' );
return $result;
}
@@ -433,19 +441,25 @@
* @return array
*/
private function convertMessageToResult( Message $message ) {
- $res = $this->apiModule->getResult();
-
$name = $message->getKey();
$params = $message->getParams();
$row = array();
- $res->setElement( $row, 'name', $name );
-
- $res->setElement( $row, 'parameters', $params );
- $res->setIndexedTagName( $row['parameters'], 'parameter' );
-
$html = $this->forceMessageLanguage( $message, $this->language
)->useDatabase( true )->parse();
- $res->setContent( $row, $html, 'html' );
+
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ ApiResult::setValue( $row, 'name', $name );
+ ApiResult::setValue( $row, 'parameters', $params );
+ ApiResult::setIndexedTagName( $row['parameters'],
'parameter' );
+ ApiResult::setContentValue( $row, 'html', $html );
+ $row[ApiResult::META_BC_SUBELEMENTS][] = 'html';
+ } else {
+ $res = $this->apiModule->getResult();
+ ApiResult::setElement( $row, 'name', $name );
+ ApiResult::setElement( $row, 'parameters', $params );
+ $res->setIndexedTagName( $row['parameters'],
'parameter' );
+ ApiResult::setContent( $row, $html, 'html' );
+ }
return $row;
}
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 2e6bd5f..cda9111 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -94,7 +94,11 @@
//todo remove once result builder is used... (what exactly does
this do....?)
if ( $this->getResult()->getIsRawMode() ) {
- $this->getResult()->setIndexedTagName_internal( array(
'entities' ), 'entity' );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $this->getResult()->defineIndexedTagName(
array( 'entities' ), 'entity' );
+ } else {
+ $this->getResult()->setIndexedTagName_internal(
array( 'entities' ), 'entity' );
+ }
}
$this->getResultBuilder()->markSuccess( 1 );
diff --git a/repo/includes/api/ResultBuilder.php
b/repo/includes/api/ResultBuilder.php
index a6425ea..ab1dfc2 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -205,7 +205,11 @@
$this->result->addValue( $path, $key, $value );
if ( $this->result->getIsRawMode() && !is_string( $key ) ) {
- $this->result->setIndexedTagName_internal( $path, $tag
);
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $this->result->defineIndexedTagName( $path,
$tag );
+ } else {
+ $this->result->setIndexedTagName_internal(
$path, $tag );
+ }
}
}
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index b774947..97a2d6f 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -291,7 +291,11 @@
$entries
);
- $this->getResult()->setIndexedTagName_internal( array( 'search'
), 'entity' );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $this->getResult()->defineIndexedTagName( array(
'search' ), 'entity' );
+ } else {
+ $this->getResult()->setIndexedTagName_internal( array(
'search' ), 'entity' );
+ }
// @todo use result builder?
$this->getResult()->addValue(
diff --git a/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
b/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
index 8458a42..0504be3 100644
--- a/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
+++ b/repo/tests/phpunit/includes/api/ApiErrorReporterTest.php
@@ -315,7 +315,11 @@
$reporter->reportStatusWarnings( $status );
- $result = $api->getResult()->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $result = $api->getResult()->getResultData();
+ } else {
+ $result = $api->getResult()->getData();
+ }
foreach ( $expectedDataFields as $path => $value ) {
$path = explode( '/', $path );
diff --git a/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
b/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
index fd31f85..eaa1da9 100644
--- a/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
+++ b/repo/tests/phpunit/includes/api/CreateRedirectModuleTest.php
@@ -138,7 +138,15 @@
$module->execute();
$result = $module->getResult();
- return $result->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ return $data;
}
private function assertSuccess( $result ) {
diff --git a/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
b/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
index aecb8b5..0d5a2e1 100644
--- a/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
@@ -53,7 +53,16 @@
public function doApiRequest( $params ) {
$module = $this->getModule( $params );
$module->execute();
- return $module->getResultData();
+
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $module->getResult()->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $module->getResultData();
+ }
+ return $data;
}
/**
diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 36578f2..8ac5b98 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -120,7 +120,15 @@
$module->execute();
$result = $module->getResult();
- return $result->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ return $data;
}
public function provideData() {
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 776596d..da7d44b 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -122,7 +122,15 @@
$result = $this->getDefaultResult();
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->markSuccess( $param );
- $this->assertEquals( array( 'success' => $expected ),
$result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( array( 'success' => $expected ), $data );
}
public function provideMarkResultSuccess() {
@@ -297,7 +305,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addEntityRevision( null, $entityRevision, new
SerializationOptions(), $props );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddEntityRevisionKey() {
@@ -312,13 +328,21 @@
// automatic key
$resultBuilder->addEntityRevision( null, $entityRevision, new
SerializationOptions(), $props );
- $data = $result->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ } else {
+ $data = $result->getData();
+ }
$this->assertArrayHasKey( 'Q11', $data['entities'] );
// explicit key
$resultBuilder->addEntityRevision( 'FOO', $entityRevision, new
SerializationOptions(), $props );
- $data = $result->getData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ } else {
+ $data = $result->getData();
+ }
$this->assertArrayHasKey( 'FOO', $data['entities'] );
}
@@ -351,7 +375,15 @@
),
) );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
/**
@@ -404,7 +436,15 @@
'_element' => 'entity'
) );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddBasicEntityInformation() {
@@ -418,7 +458,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addBasicEntityInformation( $entityId, 'entity'
);
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddLabels(){
@@ -445,7 +493,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addLabels( $labels, $path );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddDescriptions(){
@@ -472,7 +528,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addDescriptions( $descriptions, $path );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddAliases(){
@@ -511,7 +575,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addAliases( $aliases, $path );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddSiteLinks(){
@@ -543,7 +615,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addSiteLinks( $siteLinks, $path );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddClaims(){
@@ -579,7 +659,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addClaims( $claims, $path );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddClaim(){
@@ -605,7 +693,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addClaim( $claim );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddReference(){
@@ -635,7 +731,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addReference( $reference );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
/**
@@ -654,7 +758,15 @@
$resultBuilder->addMissingEntity( $key, $missingDetails
);
}
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function provideMissingEntity() {
@@ -739,7 +851,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addNormalizedTitle( $from, $to );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function testAddRevisionIdFromStatusToResult() {
@@ -759,7 +879,15 @@
$resultBuilder = $this->getResultBuilder( $result );
$resultBuilder->addRevisionIdFromStatusToResult( $mockStatus,
'entity' );
- $this->assertEquals( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertEquals( $expected, $data );
}
public function provideSetList() {
@@ -807,7 +935,15 @@
$builder = $this->getResultBuilder( $result );
$builder->setList( $path, $name, $values, $tag );
- $this->assertResultStructure( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertResultStructure( $expected, $data );
}
public function provideSetList_InvalidArgument() {
@@ -869,7 +1005,15 @@
$builder = $this->getResultBuilder( $result );
$builder->setValue( $path, $name, $value );
- $this->assertResultStructure( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertResultStructure( $expected, $data );
}
public function provideSetValue_InvalidArgument() {
@@ -949,7 +1093,15 @@
$builder = $this->getResultBuilder( $result );
$builder->appendValue( $path, $key, $value, $tag );
- $this->assertResultStructure( $expected, $result->getData() );
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $result->getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' => true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $result->getData();
+ }
+ $this->assertResultStructure( $expected, $data );
}
public function provideAppendValue_InvalidArgument() {
--
To view, visit https://gerrit.wikimedia.org/r/197383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I847a4a5a1c927cdad2b02c030e85fbf2ca8e549b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
