jenkins-bot has submitted this change and it was merged.

Change subject: Drop dead code from MockTermIndex
......................................................................


Drop dead code from MockTermIndex

Change-Id: I09f007f61deb53e0d641ddab416600c9b3ab6316
---
M lib/tests/phpunit/store/MockTermIndex.php
1 file changed, 0 insertions(+), 20 deletions(-)

Approvals:
  Adrian Lang: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/tests/phpunit/store/MockTermIndex.php 
b/lib/tests/phpunit/store/MockTermIndex.php
index 39bf096..8d4efaf 100644
--- a/lib/tests/phpunit/store/MockTermIndex.php
+++ b/lib/tests/phpunit/store/MockTermIndex.php
@@ -324,26 +324,6 @@
        }
 
        /**
-        * @param Term[] $conflicts
-        * @param EntityId $excludeId
-        *
-        * @return Term[]
-        */
-       private function filterConflictsByEntity( array $conflicts, EntityId 
$excludeId ) {
-               $filtered = array();
-
-               foreach ( $conflicts as $key => $term ) {
-                       $entityId = $term->getEntityId();
-
-                       if ( $entityId === null || !$excludeId->equals( 
$entityId ) ) {
-                               $filtered[$key] = $term;
-                       }
-               }
-
-               return $filtered;
-       }
-
-       /**
         * @param Term $term
         * @param Term[] $templates
         *

-- 
To view, visit https://gerrit.wikimedia.org/r/188342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I09f007f61deb53e0d641ddab416600c9b3ab6316
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to