Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204525
Change subject: API: Fix unit test and update for recent core change
......................................................................
API: Fix unit test and update for recent core change
Change-Id: I36f2172acc066b2261e60531b20d7099aea36f6a
---
M api/ApiQueryMessageCollection.php
M api/ApiQueryMessageGroups.php
M api/ApiQueryMessageTranslations.php
M api/ApiStatsQuery.php
M api/ApiTTMServer.php
M scripts/create-language-models.php
M tests/phpunit/api/ApiQueryMessageGroupsTest.php
M tests/phpunit/api/ApiTokensTest.php
M utils/TranslationEditPage.php
9 files changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/25/204525/1
diff --git a/api/ApiQueryMessageCollection.php
b/api/ApiQueryMessageCollection.php
index 9165cb9..20c819c 100644
--- a/api/ApiQueryMessageCollection.php
+++ b/api/ApiQueryMessageCollection.php
@@ -123,7 +123,7 @@
if ( is_null( $resultPageSet ) ) {
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result->defineIndexedTagName(
+ $result->addIndexedTagName(
array( 'query', $this->getModuleName()
),
'message'
);
@@ -170,7 +170,7 @@
foreach ( $message->getPropertyNames() as $prop ) {
$data['properties'][$prop] =
$message->getProperty( $prop );
if ( defined( 'ApiResult::META_CONTENT' ) ) {
-
ApiResult::setIndexedTagNameOnSubarrays( $data['properties'], 'val' );
+ ApiResult::setIndexedTagNameRecursive(
$data['properties'], 'val' );
} else {
$result->setIndexedTagName_recursive(
$data['properties'], 'val' );
}
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 4706397..a948478 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -101,7 +101,7 @@
}
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result->defineIndexedTagName( array( 'query',
$this->getModuleName() ), 'group' );
+ $result->addIndexedTagName( array( 'query',
$this->getModuleName() ), 'group' );
} else {
$result->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'group' );
}
diff --git a/api/ApiQueryMessageTranslations.php
b/api/ApiQueryMessageTranslations.php
index ba11ab3..6b5aa6e 100644
--- a/api/ApiQueryMessageTranslations.php
+++ b/api/ApiQueryMessageTranslations.php
@@ -119,7 +119,7 @@
}
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result->defineIndexedTagName( array( 'query',
$this->getModuleName() ), 'message' );
+ $result->addIndexedTagName( array( 'query',
$this->getModuleName() ), 'message' );
} else {
$result->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'message' );
}
diff --git a/api/ApiStatsQuery.php b/api/ApiStatsQuery.php
index 4502556..bf1e1e9 100644
--- a/api/ApiStatsQuery.php
+++ b/api/ApiStatsQuery.php
@@ -40,7 +40,7 @@
}
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result->defineIndexedTagName( array( 'query',
$this->getModuleName() ), 'stats' );
+ $result->addIndexedTagName( array( 'query',
$this->getModuleName() ), 'stats' );
} else {
$result->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'stats' );
}
diff --git a/api/ApiTTMServer.php b/api/ApiTTMServer.php
index 29837ff..4fdc562 100644
--- a/api/ApiTTMServer.php
+++ b/api/ApiTTMServer.php
@@ -37,7 +37,7 @@
}
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result->defineIndexedTagName( $this->getModuleName(),
'suggestion' );
+ $result->addIndexedTagName( $this->getModuleName(),
'suggestion' );
} else {
$result->setIndexedTagName_internal(
$this->getModuleName(), 'suggestion' );
}
diff --git a/scripts/create-language-models.php
b/scripts/create-language-models.php
index 33d2456..12c9274 100644
--- a/scripts/create-language-models.php
+++ b/scripts/create-language-models.php
@@ -205,8 +205,9 @@
$api->execute();
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $result =
$api->getResult()->getResultData();
- $result = ApiResult::transformForBC(
$result );
+ $result =
$api->getResult()->getResultData(
+ 'BC' => array(),
+ );
} else {
$result = $api->getResultData();
}
diff --git a/tests/phpunit/api/ApiQueryMessageGroupsTest.php
b/tests/phpunit/api/ApiQueryMessageGroupsTest.php
index 3882d39..0a11031 100644
--- a/tests/phpunit/api/ApiQueryMessageGroupsTest.php
+++ b/tests/phpunit/api/ApiQueryMessageGroupsTest.php
@@ -157,6 +157,6 @@
$this->assertCount( 1, $data['warnings'] );
$this->assertArrayHasKey( 'messagegroups', $data['warnings'] );
$this->assertCount( 1, $data['warnings']['messagegroups'] );
- $this->assertArrayHasKey( '*',
$data['warnings']['messagegroups'] );
+ $this->assertArrayHasKey( 'warnings',
$data['warnings']['messagegroups'] );
}
}
diff --git a/tests/phpunit/api/ApiTokensTest.php
b/tests/phpunit/api/ApiTokensTest.php
index 0f689c2..5992828 100644
--- a/tests/phpunit/api/ApiTokensTest.php
+++ b/tests/phpunit/api/ApiTokensTest.php
@@ -31,9 +31,9 @@
$api->execute();
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $data = ApiResult::removeMetadata(
- $api->getResult()->getResultData()
- );
+ $data = $api->getResult()->getResultData( null, array(
+ 'Strip' => 'all',
+ ) );
} else {
$data = $api->getResultData();
}
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index 2ed9474..8364422 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
@@ -222,7 +222,7 @@
}
$data = $data['query']['pages'];
if ( defined( 'ApiResult::META_CONTENT' ) ) {
- $data = ApiResult::removeMetadataNonRecursive( $data );
+ $data = ApiResult::stripMetadataNonRecursive( $data );
}
$data = array_shift( $data );
--
To view, visit https://gerrit.wikimedia.org/r/204525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36f2172acc066b2261e60531b20d7099aea36f6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
