jenkins-bot has submitted this change and it was merged.
Change subject: Fix wrong return type in NullUsageTracker
......................................................................
Fix wrong return type in NullUsageTracker
The interface requires an array and does not allow null/void. Luckily
this is not critical in production because the returned value is
checked with "if ( !empty( $array ) )" which happens to work for both
null and empty arrays.
Change-Id: I395abd0875dcd7db0543f6fe736ccb6630fc7db9
---
M client/includes/Usage/NullUsageTracker.php
M client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/Usage/NullUsageTracker.php
b/client/includes/Usage/NullUsageTracker.php
index b8c1e3d..0d6b100 100644
--- a/client/includes/Usage/NullUsageTracker.php
+++ b/client/includes/Usage/NullUsageTracker.php
@@ -30,9 +30,11 @@
*
* @param int $pageId
* @param EntityUsage[] $usages
+ *
+ * @return EntityUsage[]
*/
public function replaceUsedEntities( $pageId, array $usages ) {
- // no-op
+ return array();
}
/**
diff --git a/client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
b/client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
index df9110b..1ec90b5 100644
--- a/client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
+++ b/client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
@@ -25,7 +25,7 @@
public function testReplaceUsedEntities() {
$instance = new NullUsageTracker();
- $this->assertNull( $instance->replaceUsedEntities( 0, array() )
);
+ $this->assertSame( array(), $instance->replaceUsedEntities( 0,
array() ) );
}
public function testPruneUsages() {
--
To view, visit https://gerrit.wikimedia.org/r/285145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I395abd0875dcd7db0543f6fe736ccb6630fc7db9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
