[MediaWiki-commits] [Gerrit] Revert Use EntityIdFormatter in MessageParameterFormatter - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199587
Change subject: Revert Use EntityIdFormatter in MessageParameterFormatter
..
Revert Use EntityIdFormatter in MessageParameterFormatter
will be just for the branch for now, since it causes T93804.
we can investigate more proper fix for master, as using
EntityIdFormatter here is a good idea.
This reverts commit fb60de9acf5ffa5347fc0f57656073154e170c97.
Bug: T93804
Change-Id: I330d4761a47bb244f4fde4d7b549e24aa4410c79
---
M lib/includes/formatters/EntityIdLinkFormatter.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M repo/includes/Localizer/MessageParameterFormatter.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
5 files changed, 32 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/87/199587/1
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php
b/lib/includes/formatters/EntityIdLinkFormatter.php
index 9a520aa..60567f4 100644
--- a/lib/includes/formatters/EntityIdLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -24,7 +24,7 @@
public function formatEntityId( EntityId $entityId ) {
$title = parent::formatEntityId( $entityId );
- return [[$title| . wfEscapeWikiText(
$entityId-getSerialization() ) . ]];
+ return [[$title]];
}
}
diff --git a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
index d7084b9..035a916 100644
--- a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
+++ b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
@@ -5,6 +5,7 @@
use LogicException;
use PHPUnit_Framework_TestCase;
use Title;
+use ValueFormatters\FormatterOptions;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -16,6 +17,8 @@
* @covers Wikibase\Lib\EntityIdLinkFormatter
*
* @group Wikibase
+ * @group ValueFormatters
+ * @group DataValueExtensions
* @group WikibaseLib
* @group EntityIdFormatterTest
*
@@ -28,11 +31,11 @@
return array(
'ItemId' = array(
new ItemId( 'Q23' ),
- '[[ITEM-TEST--Q23|Q23]]'
+ '[[ITEM-TEST--Q23]]'
),
'PropertyId' = array(
new PropertyId( 'P23' ),
- '[[PROPERTY-TEST--P23|P23]]'
+ '[[PROPERTY-TEST--P23]]'
),
);
}
@@ -58,7 +61,8 @@
}
}
- private function newEntityIdLinkFormatter() {
+ protected function newEntityIdLinkFormatter() {
+ $options = new FormatterOptions();
$titleLookup = $this-getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup-expects( $this-any() )-method( 'getTitleForId' )
-will( $this-returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/includes/Localizer/MessageParameterFormatter.php
b/repo/includes/Localizer/MessageParameterFormatter.php
index 6cd3c75..7d54deb 100644
--- a/repo/includes/Localizer/MessageParameterFormatter.php
+++ b/repo/includes/Localizer/MessageParameterFormatter.php
@@ -10,8 +10,8 @@
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\MediaWikiNumberLocalizer;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* ValueFormatter for formatting objects that may be encountered in
@@ -28,9 +28,9 @@
private $dataValueFormatter;
/**
-* @var EntityIdFormatter
+* @var EntityTitleLookup
*/
- private $entityIdFormatter;
+ private $entityTitleLookup;
/**
* @var SiteStore
@@ -49,18 +49,18 @@
/**
* @param ValueFormatter $dataValueFormatter A formatter for turning
DataValues into wikitext.
-* @param EntityIdFormatter $entityIdFormatter An entity id formatter
returning wikitext.
+* @param EntityTitleLookup $entityTitleLookup
* @param SiteStore $sites
* @param Language $language
*/
public function __construct(
ValueFormatter $dataValueFormatter,
- EntityIdFormatter $entityIdFormatter,
+ EntityTitleLookup $entityTitleLookup,
SiteStore $sites,
Language $language
) {
$this-dataValueFormatter = $dataValueFormatter;
- $this-entityIdFormatter = $entityIdFormatter;
+
[MediaWiki-commits] [Gerrit] Revert Use EntityIdFormatter in MessageParameterFormatter - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199586
Change subject: Revert Use EntityIdFormatter in MessageParameterFormatter
..
Revert Use EntityIdFormatter in MessageParameterFormatter
will be just for the branch for now, since it causes T93804.
we can investigate more proper fix for master, as using
EntityIdFormatter here is a good idea.
This reverts commit fb60de9acf5ffa5347fc0f57656073154e170c97.
Bug: T93804
Change-Id: I330d4761a47bb244f4fde4d7b549e24aa4410c79
---
M lib/includes/formatters/EntityIdLinkFormatter.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M repo/includes/Localizer/MessageParameterFormatter.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
5 files changed, 32 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/199586/1
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php
b/lib/includes/formatters/EntityIdLinkFormatter.php
index 9a520aa..60567f4 100644
--- a/lib/includes/formatters/EntityIdLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -24,7 +24,7 @@
public function formatEntityId( EntityId $entityId ) {
$title = parent::formatEntityId( $entityId );
- return [[$title| . wfEscapeWikiText(
$entityId-getSerialization() ) . ]];
+ return [[$title]];
}
}
diff --git a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
index d7084b9..035a916 100644
--- a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
+++ b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
@@ -5,6 +5,7 @@
use LogicException;
use PHPUnit_Framework_TestCase;
use Title;
+use ValueFormatters\FormatterOptions;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -16,6 +17,8 @@
* @covers Wikibase\Lib\EntityIdLinkFormatter
*
* @group Wikibase
+ * @group ValueFormatters
+ * @group DataValueExtensions
* @group WikibaseLib
* @group EntityIdFormatterTest
*
@@ -28,11 +31,11 @@
return array(
'ItemId' = array(
new ItemId( 'Q23' ),
- '[[ITEM-TEST--Q23|Q23]]'
+ '[[ITEM-TEST--Q23]]'
),
'PropertyId' = array(
new PropertyId( 'P23' ),
- '[[PROPERTY-TEST--P23|P23]]'
+ '[[PROPERTY-TEST--P23]]'
),
);
}
@@ -58,7 +61,8 @@
}
}
- private function newEntityIdLinkFormatter() {
+ protected function newEntityIdLinkFormatter() {
+ $options = new FormatterOptions();
$titleLookup = $this-getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup-expects( $this-any() )-method( 'getTitleForId' )
-will( $this-returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/includes/Localizer/MessageParameterFormatter.php
b/repo/includes/Localizer/MessageParameterFormatter.php
index 6cd3c75..7d54deb 100644
--- a/repo/includes/Localizer/MessageParameterFormatter.php
+++ b/repo/includes/Localizer/MessageParameterFormatter.php
@@ -10,8 +10,8 @@
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\MediaWikiNumberLocalizer;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* ValueFormatter for formatting objects that may be encountered in
@@ -28,9 +28,9 @@
private $dataValueFormatter;
/**
-* @var EntityIdFormatter
+* @var EntityTitleLookup
*/
- private $entityIdFormatter;
+ private $entityTitleLookup;
/**
* @var SiteStore
@@ -49,18 +49,18 @@
/**
* @param ValueFormatter $dataValueFormatter A formatter for turning
DataValues into wikitext.
-* @param EntityIdFormatter $entityIdFormatter An entity id formatter
returning wikitext.
+* @param EntityTitleLookup $entityTitleLookup
* @param SiteStore $sites
* @param Language $language
*/
public function __construct(
ValueFormatter $dataValueFormatter,
- EntityIdFormatter $entityIdFormatter,
+ EntityTitleLookup $entityTitleLookup,
SiteStore $sites,
Language $language
) {
$this-dataValueFormatter = $dataValueFormatter;
- $this-entityIdFormatter = $entityIdFormatter;
+
[MediaWiki-commits] [Gerrit] Revert Use EntityIdFormatter in MessageParameterFormatter - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Use EntityIdFormatter in MessageParameterFormatter
..
Revert Use EntityIdFormatter in MessageParameterFormatter
will be just for the branch for now, since it causes T93804.
we can investigate more proper fix for master, as using
EntityIdFormatter here is a good idea.
This reverts commit fb60de9acf5ffa5347fc0f57656073154e170c97.
Bug: T93804
Change-Id: I330d4761a47bb244f4fde4d7b549e24aa4410c79
---
M lib/includes/formatters/EntityIdLinkFormatter.php
M lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
M repo/includes/Localizer/MessageParameterFormatter.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Localizer/MessageParameterFormatterTest.php
5 files changed, 32 insertions(+), 22 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php
b/lib/includes/formatters/EntityIdLinkFormatter.php
index 9a520aa..60567f4 100644
--- a/lib/includes/formatters/EntityIdLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -24,7 +24,7 @@
public function formatEntityId( EntityId $entityId ) {
$title = parent::formatEntityId( $entityId );
- return [[$title| . wfEscapeWikiText(
$entityId-getSerialization() ) . ]];
+ return [[$title]];
}
}
diff --git a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
index d7084b9..035a916 100644
--- a/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
+++ b/lib/tests/phpunit/formatters/EntityIdLinkFormatterTest.php
@@ -5,6 +5,7 @@
use LogicException;
use PHPUnit_Framework_TestCase;
use Title;
+use ValueFormatters\FormatterOptions;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -16,6 +17,8 @@
* @covers Wikibase\Lib\EntityIdLinkFormatter
*
* @group Wikibase
+ * @group ValueFormatters
+ * @group DataValueExtensions
* @group WikibaseLib
* @group EntityIdFormatterTest
*
@@ -28,11 +31,11 @@
return array(
'ItemId' = array(
new ItemId( 'Q23' ),
- '[[ITEM-TEST--Q23|Q23]]'
+ '[[ITEM-TEST--Q23]]'
),
'PropertyId' = array(
new PropertyId( 'P23' ),
- '[[PROPERTY-TEST--P23|P23]]'
+ '[[PROPERTY-TEST--P23]]'
),
);
}
@@ -58,7 +61,8 @@
}
}
- private function newEntityIdLinkFormatter() {
+ protected function newEntityIdLinkFormatter() {
+ $options = new FormatterOptions();
$titleLookup = $this-getMock(
'Wikibase\Lib\Store\EntityTitleLookup' );
$titleLookup-expects( $this-any() )-method( 'getTitleForId' )
-will( $this-returnCallback( array( $this,
'getTitleForId' ) ) );
diff --git a/repo/includes/Localizer/MessageParameterFormatter.php
b/repo/includes/Localizer/MessageParameterFormatter.php
index 6cd3c75..7d54deb 100644
--- a/repo/includes/Localizer/MessageParameterFormatter.php
+++ b/repo/includes/Localizer/MessageParameterFormatter.php
@@ -10,8 +10,8 @@
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\MediaWikiNumberLocalizer;
+use Wikibase\Lib\Store\EntityTitleLookup;
/**
* ValueFormatter for formatting objects that may be encountered in
@@ -28,9 +28,9 @@
private $dataValueFormatter;
/**
-* @var EntityIdFormatter
+* @var EntityTitleLookup
*/
- private $entityIdFormatter;
+ private $entityTitleLookup;
/**
* @var SiteStore
@@ -49,18 +49,18 @@
/**
* @param ValueFormatter $dataValueFormatter A formatter for turning
DataValues into wikitext.
-* @param EntityIdFormatter $entityIdFormatter An entity id formatter
returning wikitext.
+* @param EntityTitleLookup $entityTitleLookup
* @param SiteStore $sites
* @param Language $language
*/
public function __construct(
ValueFormatter $dataValueFormatter,
- EntityIdFormatter $entityIdFormatter,
+ EntityTitleLookup $entityTitleLookup,
SiteStore $sites,
Language $language
) {
$this-dataValueFormatter = $dataValueFormatter;
- $this-entityIdFormatter = $entityIdFormatter;
+
