Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148664
Change subject: Rename Renderer interface to PropertyClaimsRenderer
......................................................................
Rename Renderer interface to PropertyClaimsRenderer
per code review in I5b674ee
Change-Id: I56f7bc47155d9075f4199d5e9193b3d3040bc3d9
---
M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
R client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
R
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
M client/includes/DataAccess/PropertyParserFunction/Runner.php
M client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
M client/includes/WikibaseClient.php
R
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
9 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/64/148664/1
diff --git
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
index 5f0a852..2c5c304 100644
---
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
@@ -17,7 +17,7 @@
use Wikibase\PropertyLabelResolver;
/**
- * Renderer of the {{#property}} parser function.
+ * PropertyClaimsRenderer of the {{#property}} parser function.
*
* @fixme see what code can be shared with Lua handling code.
*
@@ -29,7 +29,7 @@
* @author Daniel Kinzler
* @author Liangent < [email protected] >
*/
-class LanguageAwareRenderer implements Renderer {
+class LanguageAwareRenderer implements PropertyClaimsRenderer {
private $language;
private $propertyIdResolver;
diff --git a/client/includes/DataAccess/PropertyParserFunction/Renderer.php
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
similarity index 92%
rename from client/includes/DataAccess/PropertyParserFunction/Renderer.php
rename to
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
index 72daab8..dbdb89b 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Renderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
@@ -12,7 +12,7 @@
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
*/
-interface Renderer {
+interface PropertyClaimsRenderer {
/**
* @param EntityId $entityId
diff --git
a/client/includes/DataAccess/PropertyParserFunction/RendererFactory.php
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
similarity index 98%
rename from
client/includes/DataAccess/PropertyParserFunction/RendererFactory.php
rename to
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
index 05ed3f9..df8b380 100644
--- a/client/includes/DataAccess/PropertyParserFunction/RendererFactory.php
+++
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
@@ -15,7 +15,7 @@
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
*/
-class RendererFactory {
+class PropertyClaimsRendererFactory {
/**
* @var PropertyIdResolver
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index dba1941..5d40d0b 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -22,7 +22,7 @@
class Runner {
/**
- * @var RendererFactory
+ * @var PropertyClaimsRendererFactory
*/
private $rendererFactory;
@@ -37,12 +37,12 @@
private $siteId;
/**
- * @param RendererFactory $rendererFactory
+ * @param PropertyCLaimsRendererFactory $rendererFactory
* @param SiteLinkLookup $siteLinkLookup
* @param string $siteId
*/
public function __construct(
- RendererFactory $rendererFactory,
+ PropertyClaimsRendererFactory $rendererFactory,
SiteLinkLookup $siteLinkLookup,
$siteId
) {
diff --git
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
index a7f5143..34ce72d 100644
---
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
@@ -17,10 +17,10 @@
* @author Daniel Kinzler
* @author Liangent < [email protected] >
*/
-class VariantsAwareRenderer implements Renderer {
+class VariantsAwareRenderer implements PropertyClaimsRenderer {
/**
- * @var RendererFactory
+ * @var PropertyClaimsRendererFactory
*/
private $rendererFactory;
@@ -30,10 +30,10 @@
private $variants;
/**
- * @param RendererFactory $rendererFactory
+ * @param PropertyClaimsRendererFactory $rendererFactory
* @param string[] $variants
*/
- public function __construct( RendererFactory $rendererFactory, array
$variants ) {
+ public function __construct( PropertyClaimsRendererFactory
$rendererFactory, array $variants ) {
$this->rendererFactory = $rendererFactory;
$this->variants = $variants;
}
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 179cfff..2f249b7 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -17,8 +17,8 @@
use ValueFormatters\FormatterOptions;
use Wikibase\ClientStore;
use Wikibase\Client\Hooks\ParserFunctionRegistrant;
+use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory;
use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver;
-use Wikibase\DataAccess\PropertyParserFunction\RendererFactory;
use Wikibase\DataAccess\PropertyParserFunction\Runner;
use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
@@ -671,7 +671,7 @@
/**
* @return RendererFactory
*/
- private function getPropertyParserFunctionRendererFactory() {
+ private function getPropertyClaimsRendererFactory() {
$snaksFinder = new SnaksFinder(
$this->getEntityLookup()
);
@@ -680,7 +680,7 @@
$this->getStore()->getPropertyLabelResolver()
);
- return new RendererFactory(
+ return new PropertyClaimsRendererFactory(
$propertyIdResolver,
$snaksFinder,
$this->getLanguageFallbackChainFactory(),
@@ -693,7 +693,7 @@
*/
public function getPropertyParserFunctionRunner() {
return new Runner(
- $this->getPropertyParserFunctionRendererFactory(),
+ $this->getPropertyClaimsRendererFactory(),
$this->getStore()->getSiteLinkTable(),
$this->getSettings()->getSetting( 'siteGlobalID' )
);
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
similarity index 92%
rename from
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
rename to
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
index ea3a5ee..516cb79 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
@@ -7,13 +7,13 @@
use ParserOptions;
use Title;
use User;
-use Wikibase\DataAccess\PropertyParserFunction\RendererFactory;
+use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\SnakFormatter;
/**
- * @covers Wikibase\DataAccess\PropertyParserFunction\RendererFactory
+ * @covers
Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory
*
* @group Wikibase
* @group WikibaseClient
@@ -23,7 +23,7 @@
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
*/
-class RendererFactoryTest extends \PHPUnit_Framework_TestCase {
+class PropertyClaimsRendererFactoryTest extends \PHPUnit_Framework_TestCase {
/**
* @dataProvider newFromParserProvider
@@ -39,7 +39,7 @@
$outputType
);
- $rendererFactory = new RendererFactory(
+ $rendererFactory = new PropertyClaimsRendererFactory(
$this->getPropertyIdResolver(),
$this->getSnaksFinder(),
$this->getLanguageFallbackChainFactory(),
@@ -68,7 +68,7 @@
}
public function testNewLanguageAwareRenderer() {
- $rendererFactory = new RendererFactory(
+ $rendererFactory = new PropertyClaimsRendererFactory(
$this->getPropertyIdResolver(),
$this->getSnaksFinder(),
$this->getLanguageFallbackChainFactory(),
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
index 509d9c1..9d89bbf 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
@@ -8,7 +8,7 @@
use Status;
use Title;
use User;
-use Wikibase\DataAccess\PropertyParserFunction\Renderer;
+use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRenderer;
use Wikibase\DataAccess\PropertyParserFunction\Runner;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
@@ -32,7 +32,7 @@
public function testRunPropertyParserFunction() {
$runner = new Runner(
- $this->getRendererFactory(),
+ $this->getPropertyClaimsRenderer(),
$this->getSiteLinkLookup(),
'enwiki'
);
@@ -60,11 +60,11 @@
return $siteLinkLookup;
}
- private function getRendererFactory() {
+ private function getPropertyClaimsRenderer() {
$renderer = $this->getRenderer();
$rendererFactory = $this->getMockBuilder(
-
'Wikibase\DataAccess\PropertyParserFunction\RendererFactory'
+
'Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory'
)
->disableOriginalConstructor()
->getMock();
@@ -78,7 +78,7 @@
private function getRenderer() {
$renderer = $this->getMockBuilder(
-
'Wikibase\DataAccess\PropertyParserFunction\Renderer'
+
'Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRenderer'
)
->disableOriginalConstructor()
->getMock();
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index d58ee86..e6122d1 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -25,7 +25,7 @@
$languageRenderer = $this->getLanguageAwareRenderer();
$rendererFactory = $this->getMockBuilder(
-
'Wikibase\DataAccess\PropertyParserFunction\RendererFactory'
+
'Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory'
)
->disableOriginalConstructor()
->getMock();
@@ -67,7 +67,7 @@
private function getLanguageAwareRenderer() {
$languageRenderer = $this->getMockBuilder(
- 'Wikibase\DataAccess\PropertyParserFunction\Renderer'
+
'Wikibase\DataAccess\PropertyParserFunction\LanguageAwareRenderer'
)
->disableOriginalConstructor()
->getMock();
--
To view, visit https://gerrit.wikimedia.org/r/148664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f7bc47155d9075f4199d5e9193b3d3040bc3d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
