Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/230752
Change subject: Use EntityIdFormatter interface from DataModelServices ...................................................................... Use EntityIdFormatter interface from DataModelServices Change-Id: Ie8560ed2ac376366c15022ccb582bee5df4fcfdf --- D lib/includes/formatters/EntityIdFormatter.php M lib/includes/formatters/EntityIdLabelFormatter.php M lib/includes/formatters/EntityIdTitleFormatter.php M lib/includes/formatters/EntityIdValueFormatter.php M lib/includes/formatters/EscapingEntityIdFormatter.php M lib/includes/formatters/PlainEntityIdFormatter.php M repo/includes/Diff/DiffView.php M repo/includes/Diff/DifferencesSnakVisualizer.php M repo/includes/Diff/EntityContentDiffView.php M repo/includes/Diff/EntityDiffVisualizer.php M repo/includes/Localizer/MessageParameterFormatter.php M repo/includes/SummaryFormatter.php M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php M view/src/EntityIdFormatterFactory.php M view/src/SiteLinksView.php M view/src/SnakHtmlGenerator.php M view/src/StatementGroupListView.php M view/tests/phpunit/ClaimHtmlGeneratorTest.php M view/tests/phpunit/SiteLinksViewTest.php M view/tests/phpunit/SnakHtmlGeneratorTest.php M view/tests/phpunit/StatementGroupListViewTest.php 23 files changed, 25 insertions(+), 43 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/52/230752/1 diff --git a/lib/includes/formatters/EntityIdFormatter.php b/lib/includes/formatters/EntityIdFormatter.php deleted file mode 100644 index c6d8bb9..0000000 --- a/lib/includes/formatters/EntityIdFormatter.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php - -namespace Wikibase\Lib; - -use Wikibase\DataModel\Entity\EntityId; - -/** - * @licence GNU GPL v2+ - * @author Jeroen De Dauw < [email protected] > - * @author Thiemo Mättig - */ -interface EntityIdFormatter { - - /** - * Format an EntityId - * - * @param EntityId $value - * - * @return string - */ - public function formatEntityId( EntityId $value ); - -} diff --git a/lib/includes/formatters/EntityIdLabelFormatter.php b/lib/includes/formatters/EntityIdLabelFormatter.php index 7553281..edda2b2 100644 --- a/lib/includes/formatters/EntityIdLabelFormatter.php +++ b/lib/includes/formatters/EntityIdLabelFormatter.php @@ -4,6 +4,7 @@ use OutOfBoundsException; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Term\Term; use Wikibase\Lib\Store\LabelDescriptionLookup; diff --git a/lib/includes/formatters/EntityIdTitleFormatter.php b/lib/includes/formatters/EntityIdTitleFormatter.php index 9ad163f..6343008 100644 --- a/lib/includes/formatters/EntityIdTitleFormatter.php +++ b/lib/includes/formatters/EntityIdTitleFormatter.php @@ -3,6 +3,7 @@ namespace Wikibase\Lib; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\Lib\Store\EntityTitleLookup; /** diff --git a/lib/includes/formatters/EntityIdValueFormatter.php b/lib/includes/formatters/EntityIdValueFormatter.php index 543c1e3..54fc678 100644 --- a/lib/includes/formatters/EntityIdValueFormatter.php +++ b/lib/includes/formatters/EntityIdValueFormatter.php @@ -5,6 +5,7 @@ use InvalidArgumentException; use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityIdValue; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; /** * @since 0.5 diff --git a/lib/includes/formatters/EscapingEntityIdFormatter.php b/lib/includes/formatters/EscapingEntityIdFormatter.php index 166de45..9681bc7 100644 --- a/lib/includes/formatters/EscapingEntityIdFormatter.php +++ b/lib/includes/formatters/EscapingEntityIdFormatter.php @@ -4,6 +4,7 @@ use InvalidArgumentException; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; /** * EscapingEntityIdFormatter wraps another EntityIdFormatter and diff --git a/lib/includes/formatters/PlainEntityIdFormatter.php b/lib/includes/formatters/PlainEntityIdFormatter.php index fd3828a..b3a6008 100644 --- a/lib/includes/formatters/PlainEntityIdFormatter.php +++ b/lib/includes/formatters/PlainEntityIdFormatter.php @@ -3,6 +3,7 @@ namespace Wikibase\Lib; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; /** * @since 0.4 diff --git a/repo/includes/Diff/DiffView.php b/repo/includes/Diff/DiffView.php index 5517a70..c16df3d 100644 --- a/repo/includes/Diff/DiffView.php +++ b/repo/includes/Diff/DiffView.php @@ -14,7 +14,7 @@ use MWException; use SiteStore; use Wikibase\DataModel\Entity\ItemId; -use Wikibase\Lib\EntityIdFormatter; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; /** * Class for generating views of DiffOp objects. diff --git a/repo/includes/Diff/DifferencesSnakVisualizer.php b/repo/includes/Diff/DifferencesSnakVisualizer.php index fcece28..ba0549a 100644 --- a/repo/includes/Diff/DifferencesSnakVisualizer.php +++ b/repo/includes/Diff/DifferencesSnakVisualizer.php @@ -5,8 +5,8 @@ use Exception; use InvalidArgumentException; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Snak\Snak; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\SnakFormatter; /** diff --git a/repo/includes/Diff/EntityContentDiffView.php b/repo/includes/Diff/EntityContentDiffView.php index bed715f..c78a662 100644 --- a/repo/includes/Diff/EntityContentDiffView.php +++ b/repo/includes/Diff/EntityContentDiffView.php @@ -16,8 +16,8 @@ use Revision; use ValueFormatters\FormatterOptions; use ValueFormatters\ValueFormatter; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\EntityContent; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\EntityIdHtmlLinkFormatter; use Wikibase\Lib\EntityIdLabelFormatter; use Wikibase\Lib\EscapingEntityIdFormatter; diff --git a/repo/includes/Diff/EntityDiffVisualizer.php b/repo/includes/Diff/EntityDiffVisualizer.php index 117f15f..42cb8f8 100644 --- a/repo/includes/Diff/EntityDiffVisualizer.php +++ b/repo/includes/Diff/EntityDiffVisualizer.php @@ -12,7 +12,7 @@ use SiteStore; use Wikibase\DataModel\Services\Diff\EntityDiff; use Wikibase\DataModel\Services\Diff\ItemDiff; -use Wikibase\Lib\EntityIdFormatter; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\Repo\Content\EntityContentDiff; /** diff --git a/repo/includes/Localizer/MessageParameterFormatter.php b/repo/includes/Localizer/MessageParameterFormatter.php index 6cd3c75..ee4d66d 100644 --- a/repo/includes/Localizer/MessageParameterFormatter.php +++ b/repo/includes/Localizer/MessageParameterFormatter.php @@ -9,8 +9,8 @@ use ValueFormatters\NumberLocalizer; use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\SiteLink; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\MediaWikiNumberLocalizer; /** diff --git a/repo/includes/SummaryFormatter.php b/repo/includes/SummaryFormatter.php index 07167ff..4711984 100644 --- a/repo/includes/SummaryFormatter.php +++ b/repo/includes/SummaryFormatter.php @@ -9,10 +9,10 @@ use MWException; use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Services\EntityId\EntityIdParser; use Wikibase\DataModel\Services\EntityId\EntityIdParsingException; use Wikibase\DataModel\Snak\Snak; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\SnakFormatter; use Wikibase\Repo\WikibaseRepo; diff --git a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php index a3bb80a..34520f2 100644 --- a/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php +++ b/repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php @@ -11,8 +11,8 @@ use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\ItemId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\SiteLink; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Repo\Localizer\MessageParameterFormatter; /** diff --git a/repo/tests/phpunit/includes/api/SetClaimValueTest.php b/repo/tests/phpunit/includes/api/SetClaimValueTest.php index 209c367..79571f6 100644 --- a/repo/tests/phpunit/includes/api/SetClaimValueTest.php +++ b/repo/tests/phpunit/includes/api/SetClaimValueTest.php @@ -17,9 +17,9 @@ use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Statement\Statement; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\EntityIdPlainLinkFormatter; use Wikibase\Lib\EntityIdValueFormatter; use Wikibase\Lib\SnakFormatter; diff --git a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php index 02ff50a..e762d6e 100644 --- a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php +++ b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php @@ -11,10 +11,10 @@ use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Services\EntityId\EntityIdParser; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\PlainEntityIdFormatter; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\Store\EntityRevisionLookup; diff --git a/view/src/EntityIdFormatterFactory.php b/view/src/EntityIdFormatterFactory.php index cb50c21..91daaf2 100644 --- a/view/src/EntityIdFormatterFactory.php +++ b/view/src/EntityIdFormatterFactory.php @@ -2,7 +2,7 @@ namespace Wikibase\View; -use Wikibase\Lib\EntityIdFormatter; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\Lib\Store\LabelDescriptionLookup; /** diff --git a/view/src/SiteLinksView.php b/view/src/SiteLinksView.php index e7d8de1..5225c3c 100644 --- a/view/src/SiteLinksView.php +++ b/view/src/SiteLinksView.php @@ -6,8 +6,8 @@ use Site; use SiteList; use Wikibase\DataModel\Entity\ItemId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\SiteLink; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\LanguageNameLookup; use Wikibase\View\Template\TemplateFactory; diff --git a/view/src/SnakHtmlGenerator.php b/view/src/SnakHtmlGenerator.php index 8c4e45f..aab1a96 100644 --- a/view/src/SnakHtmlGenerator.php +++ b/view/src/SnakHtmlGenerator.php @@ -4,9 +4,9 @@ use InvalidArgumentException; use ValueFormatters\FormattingException; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Services\Lookup\PropertyNotFoundException; use Wikibase\DataModel\Snak\Snak; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\SnakFormatter; use Wikibase\View\Template\TemplateFactory; diff --git a/view/src/StatementGroupListView.php b/view/src/StatementGroupListView.php index 4c97289..e138b20 100644 --- a/view/src/StatementGroupListView.php +++ b/view/src/StatementGroupListView.php @@ -2,8 +2,8 @@ namespace Wikibase\View; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Statement\Statement; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\View\Template\TemplateFactory; /** diff --git a/view/tests/phpunit/ClaimHtmlGeneratorTest.php b/view/tests/phpunit/ClaimHtmlGeneratorTest.php index bf7f8d9..a7fccfb 100644 --- a/view/tests/phpunit/ClaimHtmlGeneratorTest.php +++ b/view/tests/phpunit/ClaimHtmlGeneratorTest.php @@ -9,11 +9,11 @@ use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Reference; use Wikibase\DataModel\ReferenceList; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\SnakList; use Wikibase\DataModel\Statement\Statement; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\View\ClaimHtmlGenerator; use Wikibase\View\SnakHtmlGenerator; use Wikibase\View\Template\TemplateFactory; @@ -52,7 +52,7 @@ * @return EntityIdFormatter */ protected function getPropertyIdFormatterMock() { - $lookup = $this->getMock( 'Wikibase\Lib\EntityIdFormatter' ); + $lookup = $this->getMock( 'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' ); $lookup->expects( $this->any() ) ->method( 'formatEntityId' ) diff --git a/view/tests/phpunit/SiteLinksViewTest.php b/view/tests/phpunit/SiteLinksViewTest.php index ddfb726..eddfad9 100644 --- a/view/tests/phpunit/SiteLinksViewTest.php +++ b/view/tests/phpunit/SiteLinksViewTest.php @@ -8,8 +8,8 @@ use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\SiteLink; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\LanguageNameLookup; use Wikibase\View\EditSectionGenerator; use Wikibase\View\SiteLinksView; @@ -211,7 +211,7 @@ * @return EntityIdFormatter */ private function getEntityIdFormatterMock() { - $entityIdFormatter = $this->getMock( 'Wikibase\Lib\EntityIdFormatter' ); + $entityIdFormatter = $this->getMock( 'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' ); $entityIdFormatter->expects( $this->any() ) ->method( 'formatEntityId' ) diff --git a/view/tests/phpunit/SnakHtmlGeneratorTest.php b/view/tests/phpunit/SnakHtmlGeneratorTest.php index 5138892..339902e 100644 --- a/view/tests/phpunit/SnakHtmlGeneratorTest.php +++ b/view/tests/phpunit/SnakHtmlGeneratorTest.php @@ -6,10 +6,10 @@ use Html; use PHPUnit_Framework_TestCase; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\Lib\SnakFormatter; use Wikibase\View\SnakHtmlGenerator; use Wikibase\View\Template\TemplateFactory; @@ -113,7 +113,7 @@ * @return EntityIdFormatter */ private function getEntityIdFormatter() { - $lookup = $this->getMock( 'Wikibase\Lib\EntityIdFormatter' ); + $lookup = $this->getMock( 'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' ); $lookup->expects( $this->any() ) ->method( 'formatEntityId' ) diff --git a/view/tests/phpunit/StatementGroupListViewTest.php b/view/tests/phpunit/StatementGroupListViewTest.php index e628488..9cdbf45 100644 --- a/view/tests/phpunit/StatementGroupListViewTest.php +++ b/view/tests/phpunit/StatementGroupListViewTest.php @@ -10,12 +10,12 @@ use Wikibase\DataModel\Entity\EntityIdValue; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Services\EntityId\EntityIdFormatter; use Wikibase\DataModel\Snak\PropertyNoValueSnak; use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; use Wikibase\DataModel\Statement\Statement; -use Wikibase\Lib\EntityIdFormatter; use Wikibase\View\ClaimHtmlGenerator; use Wikibase\View\StatementGroupListView; use Wikibase\View\Template\TemplateFactory; -- To view, visit https://gerrit.wikimedia.org/r/230752 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8560ed2ac376366c15022ccb582bee5df4fcfdf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
