Jeroen De Dauw has submitted this change and it was merged.
Change subject: Remove unused constructor params from parser function Runner
......................................................................
Remove unused constructor params from parser function Runner
Change-Id: I3bc40ed56117a53a3d2457cd26a535e55512bc93
---
M client/includes/DataAccess/PropertyParserFunction/Runner.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
3 files changed, 3 insertions(+), 35 deletions(-)
Approvals:
WikidataJenkins: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index 7f5ace9..58ef71d 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -31,16 +31,6 @@
class Runner {
/**
- * @var EntityLookup
- */
- private $entityLookup;
-
- /**
- * @var PropertyLabelResolver
- */
- private $propertyLabelResolver;
-
- /**
* @var RendererFactory
*/
private $rendererFactory;
@@ -56,21 +46,15 @@
private $siteId;
/**
- * @param EntityLookup $entityLookup
- * @param PropertyLabelResolver $propertyLabelResolver
* @param RendererFactory $rendererFactory
* @param SiteLinkLookup $siteLinkLookup
* @param string $siteId
*/
public function __construct(
- EntityLookup $entityLookup,
- PropertyLabelResolver $propertyLabelResolver,
RendererFactory $rendererFactory,
SiteLinkLookup $siteLinkLookup,
$siteId
) {
- $this->entityLookup = $entityLookup;
- $this->propertyLabelResolver = $propertyLabelResolver;
$this->rendererFactory = $rendererFactory;
$this->siteLinkLookup = $siteLinkLookup;
$this->siteId = $siteId;
@@ -147,11 +131,11 @@
/**
* @param Parser $parser
- * @param string $propertyLabel property label or ID (pXXX)
+ * @param string $propertyLabelOrId property label or ID (pXXX)
*
* @return string Wikitext
*/
- public function runPropertyParserFunction( Parser $parser,
$propertyLabel ) {
+ public function runPropertyParserFunction( Parser $parser,
$propertyLabelOrId ) {
wfProfileIn( __METHOD__ );
// @todo use id provided as argument, if arbitrary access
allowed
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index b0d5c29..1a12d89 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -688,8 +688,6 @@
*/
public function getPropertyParserFunctionRunner() {
return new Runner(
- $this->getEntityLookup(),
- $this->getStore()->getPropertyLabelResolver(),
$this->getPropertyParserFunctionRendererFactory(),
$this->getStore()->getSiteLinkTable(),
$this->getSettings()->getSetting( 'siteGlobalID' )
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
index 821dab9..195ac86 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
@@ -34,25 +34,11 @@
/**
* @param Parser $parser
* @param Renderer $renderer
- * @param Entity|null $entity
*
* @return Runner
*/
- private function getRunner( Parser $parser, Renderer $renderer, Entity
$entity = null ) {
- $entityLookup = new MockRepository();
-
- if ( $entity !== null ) {
- $entityLookup->putEntity( $entity );
- }
-
- $propertyLabelResolver = new MockPropertyLabelResolver(
- $parser->getTargetLanguage(),
- $entityLookup
- );
-
+ private function getRunner( Parser $parser, Renderer $renderer ) {
return new Runner(
- $entityLookup,
- $propertyLabelResolver,
$this->getRendererFactory( $renderer ),
$this->getSiteLinkLookup(),
'enwiki'
--
To view, visit https://gerrit.wikimedia.org/r/148066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bc40ed56117a53a3d2457cd26a535e55512bc93
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
