Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84979
Change subject: Remove formmating logic from ClaimSummaryBuilder.
......................................................................
Remove formmating logic from ClaimSummaryBuilder.
Change-Id: Icccd74578305ef1ae92522039656a07e928d593a
---
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/api/SetClaim.php
M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
3 files changed, 5 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/79/84979/1
diff --git a/repo/includes/ClaimSummaryBuilder.php
b/repo/includes/ClaimSummaryBuilder.php
index ee2359b..41ba9d5 100644
--- a/repo/includes/ClaimSummaryBuilder.php
+++ b/repo/includes/ClaimSummaryBuilder.php
@@ -31,35 +31,22 @@
private $claimDiffer;
/**
- * @var Lib\SnakFormatter
- */
- private $snakValueFormatter;
-
- /**
* Constructs a new ClaimSummaryBuilder
*
* @since 0.4
*
* @param string $apiModuleName
* @param ClaimDiffer $claimDiffer
- * @param SnakFormatter $snakValueFormatter
*
* @throws InvalidArgumentException
*/
- public function __construct( $apiModuleName, ClaimDiffer $claimDiffer,
SnakFormatter $snakValueFormatter ) {
+ public function __construct( $apiModuleName, ClaimDiffer $claimDiffer )
{
if ( !is_string( $apiModuleName ) ) {
throw new InvalidArgumentException( '$apiModuleName
needs to be a string' );
}
- if ( $snakValueFormatter->getFormat() !==
SnakFormatter::FORMAT_PLAIN ) {
- throw new InvalidArgumentException(
- 'Expected $snakValueFormatter to procude plain
text output, not '
- .
$snakValueFormatter->getFormat() );
- }
-
$this->apiModuleName = $apiModuleName;
$this->claimDiffer = $claimDiffer;
- $this->snakValueFormatter = $snakValueFormatter;
}
/**
@@ -135,8 +122,7 @@
$pairs[$key] = array();
}
- $value = $this->snakValueFormatter->formatSnak(
$snak );
- $pairs[$key][] = $value;
+ $pairs[$key][] = $snak;
}
}
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 013b6ef..aaf9b77 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -89,15 +89,9 @@
$claimDiffer = new ClaimDiffer( new CallbackListDiffer(
$comparer ) );
- $options = new FormatterOptions( array(
- //TODO: fallback chain
- ValueFormatter::OPT_LANG =>
$this->getContext()->getLanguage()->getCode()
- ) );
-
$claimSummaryBuilder = new ClaimSummaryBuilder(
$this->getModuleName(),
- $claimDiffer,
-
WikibaseRepo::getDefaultInstance()->getSnakFormatterFactory()->getSnakFormatter(
SnakFormatter::FORMAT_PLAIN, $options )
+ $claimDiffer
);
$claimSaver = new ClaimSaver(
WikibaseRepo::getDefaultInstance()->getSummaryFormatter() );
diff --git a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
index a9f5551..567ec04 100644
--- a/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
+++ b/repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php
@@ -139,23 +139,13 @@
}
public function testBuildCreateClaimSummary() {
- $snakFormatter = $this->getMockBuilder(
'Wikibase\Lib\SnakFormatter' )
- ->disableOriginalConstructor()->getMock();
- $snakFormatter->expects( $this->any() )
- ->method( 'formatSnak' )
- ->will( $this->returnValue( 'foo' ) );
- $snakFormatter->expects( $this->any() )
- ->method( 'getFormat' )
- ->will( $this->returnValue( SnakFormatter::FORMAT_PLAIN
) );
-
$comparer = function( \Comparable $old, \Comparable $new ) {
return $old->equals( $new );
};
$claimSummaryBuilder = new ClaimSummaryBuilder(
'wbsetclaim',
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
- $snakFormatter
+ new ClaimDiffer( new CallbackListDiffer( $comparer ) )
);
$claims = new Claims();
@@ -177,23 +167,13 @@
* @param string $action
*/
public function testBuildUpdateClaimSummary( $originalClaim,
$modifiedClaim, $action ) {
- $snakFormatter = $this->getMockBuilder(
'Wikibase\Lib\SnakFormatter' )
- ->disableOriginalConstructor()->getMock();
- $snakFormatter->expects( $this->any() )
- ->method( 'formatSnak' )
- ->will( $this->returnValue( 'foo' ) );
- $snakFormatter->expects( $this->any() )
- ->method( 'getFormat' )
- ->will( $this->returnValue( SnakFormatter::FORMAT_PLAIN
) );
-
$comparer = function( \Comparable $old, \Comparable $new ) {
return $old->equals( $new );
};
$claimSummaryBuilder = new ClaimSummaryBuilder(
'wbsetclaim',
- new ClaimDiffer( new CallbackListDiffer( $comparer ) ),
- $snakFormatter
+ new ClaimDiffer( new CallbackListDiffer( $comparer ) )
);
$claims = new Claims();
--
To view, visit https://gerrit.wikimedia.org/r/84979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icccd74578305ef1ae92522039656a07e928d593a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
