Jeroen De Dauw has submitted this change and it was merged.

Change subject: remove deprecated setIdFormatter method and use
......................................................................


remove deprecated setIdFormatter method and use

Change-Id: Ia051337ba3470ea8af57449743c11f920d61fedb
---
M client/includes/WikibaseClient.php
M lib/includes/formatters/EntityIdLabelFormatter.php
2 files changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 656fe52..e2c7ee6 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -147,7 +147,6 @@
                ) );
 
                $labelFormatter = new EntityIdLabelFormatter( $options, 
$this->getEntityLookup() );
-               $labelFormatter->setIdFormatter( $this->getEntityIdFormatter() 
);
 
                return $labelFormatter;
        }
diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php 
b/lib/includes/formatters/EntityIdLabelFormatter.php
index 56960cf..9fda460 100644
--- a/lib/includes/formatters/EntityIdLabelFormatter.php
+++ b/lib/includes/formatters/EntityIdLabelFormatter.php
@@ -82,15 +82,6 @@
        }
 
        /**
-        * @param EntityIdFormatter $idFormatter
-        * @deprecated
-        * @todo remove this when it's no longer being called
-        */
-       public function setIdFormatter( EntityIdFormatter $idFormatter ) {
-               // noop
-       }
-
-       /**
         * Format an EntityId data value
         *
         * @since 0.4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia051337ba3470ea8af57449743c11f920d61fedb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Daniel Werner <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to