Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240319
Change subject: Rename PropertyClaimsRenderer interface and factory
......................................................................
Rename PropertyClaimsRenderer interface and factory
Change-Id: I61050239e1cbc2be54249a74a03549f195edbf08
---
M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M client/includes/DataAccess/PropertyParserFunction/Runner.php
R client/includes/DataAccess/PropertyParserFunction/StatementGroupRenderer.php
R
client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
R
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
9 files changed, 36 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/19/240319/1
diff --git
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
index 37df56a..85929bc 100644
---
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Services\Lookup\EntityAccessLimitException;
/**
- * PropertyClaimsRenderer of the {{#property}} parser function.
+ * StatementGroupRenderer of the {{#property}} parser function.
*
* @since 0.5
*
@@ -22,7 +22,7 @@
* @author Liangent < liang...@gmail.com >
* @author Marius Hoch < h...@online.de >
*/
-class LanguageAwareRenderer implements PropertyClaimsRenderer {
+class LanguageAwareRenderer implements StatementGroupRenderer {
/**
* @var Language
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index 721483e..c3ab086 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -28,7 +28,7 @@
class Runner {
/**
- * @var PropertyClaimsRendererFactory
+ * @var StatementGroupRendererFactory
*/
private $rendererFactory;
@@ -58,7 +58,7 @@
private $allowArbitraryDataAccess;
/**
- * @param PropertyCLaimsRendererFactory $rendererFactory
+ * @param StatementGroupRendererFactory $rendererFactory
* @param SiteLinkLookup $siteLinkLookup
* @param EntityIdParser $entityIdParser
* @param RestrictedEntityLookup $restrictedEntityLookup
@@ -66,7 +66,7 @@
* @param bool $allowArbitraryDataAccess
*/
public function __construct(
- PropertyClaimsRendererFactory $rendererFactory,
+ StatementGroupRendererFactory $rendererFactory,
SiteLinkLookup $siteLinkLookup,
EntityIdParser $entityIdParser,
RestrictedEntityLookup $restrictedEntityLookup,
diff --git
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRenderer.php
similarity index 75%
rename from
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
rename to
client/includes/DataAccess/PropertyParserFunction/StatementGroupRenderer.php
index a3399ee..4a49850 100644
---
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRenderer.php
@@ -5,14 +5,15 @@
use Wikibase\DataModel\Entity\EntityId;
/**
- * Renderer for the {{#property}} parser function.
+ * Renderer for the {{#property}} parser function for
+ * rendering a Statement group.
*
* @since 0.5
*
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
*/
-interface PropertyClaimsRenderer {
+interface StatementGroupRenderer {
/**
* @param EntityId $entityId
diff --git
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
similarity index 98%
rename from
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
rename to
client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
index 9b8784b..75a63be 100644
---
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
+++
b/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
@@ -25,7 +25,7 @@
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
*/
-class PropertyClaimsRendererFactory {
+class StatementGroupRendererFactory {
/**
* @var PropertyIdResolver
@@ -81,7 +81,7 @@
/**
* @param Parser $parser
*
- * @return PropertyClaimsRenderer
+ * @return StatementGroupRenderer
*/
public function newRendererFromParser( Parser $parser ) {
$usageAccumulator = new ParserOutputUsageAccumulator(
$parser->getOutput() );
diff --git
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
index 0518c13..a1925bf 100644
---
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
@@ -16,7 +16,7 @@
* @author Daniel Kinzler
* @author Liangent < liang...@gmail.com >
*/
-class VariantsAwareRenderer implements PropertyClaimsRenderer {
+class VariantsAwareRenderer implements StatementGroupRenderer {
/**
* @var string[]
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 0bfc649..bdfd4be 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -20,7 +20,7 @@
use Wikibase\Client\Changes\ChangeRunCoalescer;
use Wikibase\Client\Changes\WikiPageUpdater;
use Wikibase\Client\DataAccess\PropertyIdResolver;
-use
Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory;
+use
Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory;
use Wikibase\Client\DataAccess\PropertyParserFunction\Runner;
use Wikibase\DataModel\Services\Lookup\RestrictedEntityLookup;
use Wikibase\Client\DataAccess\SnaksFinder;
@@ -827,9 +827,9 @@
}
/**
- * @return PropertyClaimsRendererFactory
+ * @return StatementGroupRendererFactory
*/
- private function getPropertyClaimsRendererFactory() {
+ private function getStatementGroupRendererFactory() {
$entityLookup = $this->getRestrictedEntityLookup();
$propertyIdResolver = new PropertyIdResolver(
@@ -837,7 +837,7 @@
$this->getStore()->getPropertyLabelResolver()
);
- return new PropertyClaimsRendererFactory(
+ return new StatementGroupRendererFactory(
$propertyIdResolver,
new SnaksFinder(),
$this->getLanguageFallbackChainFactory(),
@@ -851,7 +851,7 @@
*/
public function getPropertyParserFunctionRunner() {
return new Runner(
- $this->getPropertyClaimsRendererFactory(),
+ $this->getStatementGroupRendererFactory(),
$this->getStore()->getSiteLinkLookup(),
$this->getEntityIdParser(),
$this->getRestrictedEntityLookup(),
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
index f0264a7..33f58c7 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
@@ -34,7 +34,7 @@
$itemId = new ItemId( 'Q3' );
$runner = new Runner(
- $this->getPropertyClaimsRendererFactory( $itemId, 'Cat'
),
+ $this->getStatementGroupRendererFactory( $itemId, 'Cat'
),
$this->getSiteLinkLookup( $itemId ),
new BasicEntityIdParser(),
$this->getRestrictedEntityLookup(),
@@ -61,7 +61,7 @@
$itemId = new ItemId( 'Q42' );
$runner = new Runner(
- $this->getPropertyClaimsRendererFactory( $itemId, 'Cat'
),
+ $this->getStatementGroupRendererFactory( $itemId, 'Cat'
),
$this->getMock( 'Wikibase\Lib\Store\SiteLinkLookup' ),
new BasicEntityIdParser(),
$this->getRestrictedEntityLookup(),
@@ -93,7 +93,7 @@
$restrictedEntityLookup->getEntity( $itemId );
$runner = new Runner(
- $this->getPropertyClaimsRendererFactory( $itemId, 'Cat'
),
+ $this->getStatementGroupRendererFactory( $itemId, 'Cat'
),
$this->getMock( 'Wikibase\Lib\Store\SiteLinkLookup' ),
new BasicEntityIdParser(),
$restrictedEntityLookup,
@@ -111,7 +111,7 @@
public function testRunPropertyParserFunction_arbitraryAccessNotFound()
{
$rendererFactory = $this->getMockBuilder(
-
'Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory'
+
'Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory'
)
->disableOriginalConstructor()
->getMock();
@@ -199,11 +199,11 @@
return $frame;
}
- private function getPropertyClaimsRendererFactory( $entityId,
$propertyLabelOrId ) {
+ private function getStatementGroupRendererFactory( $entityId,
$propertyLabelOrId ) {
$renderer = $this->getRenderer( $entityId, $propertyLabelOrId );
$rendererFactory = $this->getMockBuilder(
-
'Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory'
+
'Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory'
)
->disableOriginalConstructor()
->getMock();
@@ -217,7 +217,7 @@
private function getRenderer( $entityId, $propertyLabelOrId ) {
$renderer = $this->getMockBuilder(
-
'Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRenderer'
+
'Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRenderer'
)
->disableOriginalConstructor()
->getMock();
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
similarity index 89%
rename from
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
rename to
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
index 2faf651..76802a3 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
@@ -7,7 +7,7 @@
use ParserOptions;
use Title;
use User;
-use
Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory;
+use
Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdValue;
@@ -19,7 +19,7 @@
use Wikibase\LanguageFallbackChainFactory;
/**
- * @covers
Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory
+ * @covers
Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory
*
* @group Wikibase
* @group WikibaseClient
@@ -29,12 +29,12 @@
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
*/
-class PropertyClaimsRendererFactoryTest extends \PHPUnit_Framework_TestCase {
+class StatementGroupRendererFactoryTest extends \PHPUnit_Framework_TestCase {
public function testNewRendererForInterfaceMessage() {
$parser = $this->getParser( 'zh', true, false, false,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -46,7 +46,7 @@
public function testNewRenderer_contentConversionDisabled() {
$parser = $this->getParser( 'zh', false, true, false,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -58,7 +58,7 @@
public function testNewRenderer_titleConversionDisabled() {
$parser = $this->getParser( 'zh', false, false, true,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -73,7 +73,7 @@
public function testNewRenderer_forParserFormat( $languageCode, $format
) {
$parser = $this->getParser( $languageCode, false, false, false,
$format );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -93,7 +93,7 @@
public function testNewRenderer_forNonVariantLanguage() {
$parser = $this->getParser( 'en', true, false, false,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -105,7 +105,7 @@
public function testNewRender_forVariantLanguage() {
$parser = $this->getParser( 'zh', false, false, false,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$this->assertInstanceOf(
@@ -117,7 +117,7 @@
public function testNewRenderer_usageTracking() {
$parser = $this->getParser( 'en', true, false, false,
Parser::OT_HTML );
- $rendererFactory = $this->getPropertyClaimsRendererFactory();
+ $rendererFactory = $this->getStatementGroupRendererFactory();
$renderer = $rendererFactory->newRendererFromParser( $parser );
$usageAccumulator = new ParserOutputUsageAccumulator(
$parser->getOutput() );
@@ -128,8 +128,8 @@
$this->assertArrayHasKey( 'Q7#T', $usages );
}
- private function getPropertyClaimsRendererFactory() {
- return new PropertyClaimsRendererFactory(
+ private function getStatementGroupRendererFactory() {
+ return new StatementGroupRendererFactory(
$this->getPropertyIdResolver(),
$this->getSnaksFinder(),
$this->getLanguageFallbackChainFactory(),
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index 1025ac5..b1a1612 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -24,7 +24,7 @@
$languageRenderer = $this->getLanguageAwareRenderer();
$rendererFactory = $this->getMockBuilder(
-
'Wikibase\Client\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory'
+
'Wikibase\Client\DataAccess\PropertyParserFunction\StatementGroupRendererFactory'
)
->disableOriginalConstructor()
->getMock();
--
To view, visit https://gerrit.wikimedia.org/r/240319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61050239e1cbc2be54249a74a03549f195edbf08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
