Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/349976 )
Change subject: Make TypedValueFormatter interface/implementations PSR-4 compatible ...................................................................... Make TypedValueFormatter interface/implementations PSR-4 compatible Bug: T76469 Change-Id: I4b586201f7dcaf8fdef17617e951a818b239f275 --- M lib/includes/Formatters/DispatchingValueFormatter.php M lib/includes/Formatters/OutputFormatValueFormatterFactory.php M lib/includes/Formatters/PropertyValueSnakFormatter.php R lib/includes/Formatters/TypedValueFormatter.php M lib/tests/phpunit/Formatters/DispatchingValueFormatterTest.php M lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php M lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php M repo/includes/Api/FormatSnakValue.php 8 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/76/349976/1 diff --git a/lib/includes/Formatters/DispatchingValueFormatter.php b/lib/includes/Formatters/DispatchingValueFormatter.php index cf937eb..d93fe65 100644 --- a/lib/includes/Formatters/DispatchingValueFormatter.php +++ b/lib/includes/Formatters/DispatchingValueFormatter.php @@ -1,6 +1,6 @@ <?php -namespace Wikibase\Lib; +namespace Wikibase\Lib\Formatters; use DataValues\DataValue; use DataValues\IllegalValueException; diff --git a/lib/includes/Formatters/OutputFormatValueFormatterFactory.php b/lib/includes/Formatters/OutputFormatValueFormatterFactory.php index 1137175..88e9d7f 100644 --- a/lib/includes/Formatters/OutputFormatValueFormatterFactory.php +++ b/lib/includes/Formatters/OutputFormatValueFormatterFactory.php @@ -8,6 +8,7 @@ use ValueFormatters\ValueFormatter; use Wikibase\LanguageFallbackChain; use Wikibase\LanguageFallbackChainFactory; +use Wikibase\Lib\Formatters\DispatchingValueFormatter; use Wikimedia\Assert\Assert; /** diff --git a/lib/includes/Formatters/PropertyValueSnakFormatter.php b/lib/includes/Formatters/PropertyValueSnakFormatter.php index ef57dab..473762a 100644 --- a/lib/includes/Formatters/PropertyValueSnakFormatter.php +++ b/lib/includes/Formatters/PropertyValueSnakFormatter.php @@ -16,6 +16,7 @@ use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\Snak; +use Wikibase\Lib\Formatters\TypedValueFormatter; /** * PropertyValueSnakFormatter is a formatter for PropertyValueSnaks. This is essentially a diff --git a/lib/includes/TypedValueFormatter.php b/lib/includes/Formatters/TypedValueFormatter.php similarity index 94% rename from lib/includes/TypedValueFormatter.php rename to lib/includes/Formatters/TypedValueFormatter.php index a81e3b8..073506f 100644 --- a/lib/includes/TypedValueFormatter.php +++ b/lib/includes/Formatters/TypedValueFormatter.php @@ -1,6 +1,6 @@ <?php -namespace Wikibase\Lib; +namespace Wikibase\Lib\Formatters; use DataValues\DataValue; use ValueFormatters\FormattingException; diff --git a/lib/tests/phpunit/Formatters/DispatchingValueFormatterTest.php b/lib/tests/phpunit/Formatters/DispatchingValueFormatterTest.php index cc9401c..1ca4e17 100644 --- a/lib/tests/phpunit/Formatters/DispatchingValueFormatterTest.php +++ b/lib/tests/phpunit/Formatters/DispatchingValueFormatterTest.php @@ -9,10 +9,10 @@ use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\EntityIdValue; use Wikibase\DataModel\Entity\ItemId; -use Wikibase\Lib\DispatchingValueFormatter; +use Wikibase\Lib\Formatters\DispatchingValueFormatter; /** - * @covers Wikibase\Lib\DispatchingValueFormatter + * @covers Wikibase\Lib\Formatters\DispatchingValueFormatter * * @group ValueFormatters * @group DataValueExtensions diff --git a/lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php b/lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php index 8241afa..4dfec8a 100644 --- a/lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php +++ b/lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php @@ -15,9 +15,9 @@ use Wikibase\DataModel\Services\EntityId\PlainEntityIdFormatter; use Wikibase\LanguageFallbackChain; use Wikibase\LanguageFallbackChainFactory; -use Wikibase\Lib\DispatchingValueFormatter; use Wikibase\Lib\EntityIdValueFormatter; use Wikibase\Lib\FormatterLabelDescriptionLookupFactory; +use Wikibase\Lib\Formatters\DispatchingValueFormatter; use Wikibase\Lib\OutputFormatValueFormatterFactory; use Wikibase\Lib\SnakFormatter; diff --git a/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php b/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php index 2ef95a2..5e79d0c 100644 --- a/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php +++ b/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php @@ -17,7 +17,7 @@ use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup; use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException; use Wikibase\DataModel\Snak\PropertyValueSnak; -use Wikibase\Lib\DispatchingValueFormatter; +use Wikibase\Lib\Formatters\DispatchingValueFormatter; use Wikibase\Lib\PropertyValueSnakFormatter; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\UnDeserializableValueFormatter; diff --git a/repo/includes/Api/FormatSnakValue.php b/repo/includes/Api/FormatSnakValue.php index 6b8fac2..8cd5c09 100644 --- a/repo/includes/Api/FormatSnakValue.php +++ b/repo/includes/Api/FormatSnakValue.php @@ -15,10 +15,10 @@ use ValueFormatters\ValueFormatter; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\Lib\Formatters\TypedValueFormatter; use Wikibase\Lib\OutputFormatValueFormatterFactory; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\SnakFormatter; -use Wikibase\Lib\TypedValueFormatter; use Wikibase\Repo\WikibaseRepo; /** -- To view, visit https://gerrit.wikimedia.org/r/349976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b586201f7dcaf8fdef17617e951a818b239f275 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
