jenkins-bot has submitted this change and it was merged.
Change subject: Fixed incorrect size for api result
..
Fixed incorrect size for api result
Added a unit test to highlight the problem
Change-Id: I5d4bcb755bd3686a92e7b111946a49892699729f
---
M includes/api/ApiResult.php
M tests/phpunit/includes/api/ApiResultTest.php
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index e28cb82..bd5fe08 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -1090,7 +1090,7 @@
$s = 0;
if ( is_array( $value ) ) {
foreach ( $value as $k => $v ) {
- if ( !self::isMetadataKey( $s ) ) {
+ if ( !self::isMetadataKey( $k ) ) {
$s += self::valueSize( $v );
}
}
diff --git a/tests/phpunit/includes/api/ApiResultTest.php
b/tests/phpunit/includes/api/ApiResultTest.php
index d43db71..9dbde3d 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -458,6 +458,13 @@
);
}
+ // Add two values and some metadata, but ensure metadata is not
counted
+ $result = new ApiResult( 100 );
+ $obj = array( 'attr' => '12345' );
+ ApiResult::setContentValue( $obj, 'content', '1234567890' );
+ $this->assertTrue( $result->addValue( null, 'foo', $obj ) );
+ $this->assertSame( 15, $result->getSize() );
+
$result = new ApiResult( 10 );
$formatter = new ApiErrorFormatter( $result, Language::factory(
'en' ), 'none', false );
$result->setErrorFormatter( $formatter );
--
To view, visit https://gerrit.wikimedia.org/r/258539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d4bcb755bd3686a92e7b111946a49892699729f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yurik
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
