jenkins-bot has submitted this change and it was merged.
Change subject: Use StatementGuidParser instead of ClaimGuidParser
......................................................................
Use StatementGuidParser instead of ClaimGuidParser
Change-Id: Ife431ec7b98de49c0af0c0ccd40c2e606dc0fb9b
---
M repo/includes/ChangeOp/ChangeOpFactoryProvider.php
M repo/includes/ChangeOp/ChangeOpStatement.php
M repo/includes/ChangeOp/ClaimChangeOpFactory.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/GetClaims.php
M repo/includes/api/ModifyClaim.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
9 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ChangeOp/ChangeOpFactoryProvider.php
b/repo/includes/ChangeOp/ChangeOpFactoryProvider.php
index 2148f01..631c8be 100644
--- a/repo/includes/ChangeOp/ChangeOpFactoryProvider.php
+++ b/repo/includes/ChangeOp/ChangeOpFactoryProvider.php
@@ -3,7 +3,7 @@
namespace Wikibase\ChangeOp;
use SiteLookup;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Lib\ClaimGuidValidator;
use Wikibase\Validators\EntityConstraintProvider;
@@ -36,7 +36,7 @@
private $guidValidator;
/**
- * @var ClaimGuidParser
+ * @var StatementGuidParser
*/
private $guidParser;
@@ -59,7 +59,7 @@
* @param EntityConstraintProvider $constraintProvider
* @param ClaimGuidGenerator $guidGenerator
* @param ClaimGuidValidator $guidValidator
- * @param ClaimGuidParser $guidParser
+ * @param StatementGuidParser $guidParser
* @param SnakValidator $snakValidator
* @param TermValidatorFactory $termValidatorFactory
* @param SiteLookup $siteLookup
@@ -68,7 +68,7 @@
EntityConstraintProvider $constraintProvider,
ClaimGuidGenerator $guidGenerator,
ClaimGuidValidator $guidValidator,
- ClaimGuidParser $guidParser,
+ StatementGuidParser $guidParser,
SnakValidator $snakValidator,
TermValidatorFactory $termValidatorFactory,
SiteLookup $siteLookup
diff --git a/repo/includes/ChangeOp/ChangeOpStatement.php
b/repo/includes/ChangeOp/ChangeOpStatement.php
index 6adb591..8c12480 100644
--- a/repo/includes/ChangeOp/ChangeOpStatement.php
+++ b/repo/includes/ChangeOp/ChangeOpStatement.php
@@ -6,11 +6,11 @@
use OutOfBoundsException;
use ValueValidators\Result;
use Wikibase\DataModel\ByPropertyIdArray;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\Lib\ClaimGuidGenerator;
@@ -46,7 +46,7 @@
private $guidValidator;
/**
- * @var ClaimGuidParser
+ * @var StatementGuidParser
*/
private $guidParser;
@@ -64,7 +64,7 @@
* @param Statement $statement
* @param ClaimGuidGenerator $guidGenerator
* @param ClaimGuidValidator $guidValidator
- * @param ClaimGuidParser $guidParser
+ * @param StatementGuidParser $guidParser
* @param SnakValidator $snakValidator
* @param int|null $index Where the claim should be placed among the
other claims.
*
@@ -74,7 +74,7 @@
Statement $statement,
ClaimGuidGenerator $guidGenerator,
ClaimGuidValidator $guidValidator,
- ClaimGuidParser $guidParser,
+ StatementGuidParser $guidParser,
SnakValidator $snakValidator,
$index = null
) {
diff --git a/repo/includes/ChangeOp/ClaimChangeOpFactory.php
b/repo/includes/ChangeOp/ClaimChangeOpFactory.php
index 845a56f..da5eb07 100644
--- a/repo/includes/ChangeOp/ClaimChangeOpFactory.php
+++ b/repo/includes/ChangeOp/ClaimChangeOpFactory.php
@@ -4,7 +4,7 @@
use InvalidArgumentException;
use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Lib\ClaimGuidGenerator;
@@ -30,7 +30,7 @@
private $guidValidator;
/**
- * @var ClaimGuidParser
+ * @var StatementGuidParser
*/
private $guidParser;
@@ -42,13 +42,13 @@
/**
* @param ClaimGuidGenerator $guidGenerator
* @param ClaimGuidValidator $guidValidator
- * @param ClaimGuidParser $guidParser
+ * @param StatementGuidParser $guidParser
* @param SnakValidator $snakValidator
*/
public function __construct(
ClaimGuidGenerator $guidGenerator,
ClaimGuidValidator $guidValidator,
- ClaimGuidParser $guidParser,
+ StatementGuidParser $guidParser,
SnakValidator $snakValidator
) {
$this->guidGenerator = $guidGenerator;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 52f6976..d9e2137 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -18,7 +18,7 @@
use ValueFormatters\ValueFormatter;
use Wikibase\Api\ApiHelperFactory;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\Diff\EntityDiffer;
use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
@@ -428,10 +428,10 @@
/**
* @since 0.5
*
- * @return ClaimGuidParser
+ * @return StatementGuidParser
*/
- public function getClaimGuidParser() {
- return new ClaimGuidParser( $this->getEntityIdParser() );
+ public function getStatementGuidParser() {
+ return new StatementGuidParser( $this->getEntityIdParser() );
}
/**
@@ -444,7 +444,7 @@
$this->getEntityConstraintProvider(),
new ClaimGuidGenerator(),
$this->getClaimGuidValidator(),
- $this->getClaimGuidParser(),
+ $this->getStatementGuidParser(),
$this->getSnakValidator(),
$this->getTermValidatorFactory(),
$this->getSiteStore()
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index c8e8b16..c7a71e7 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -50,7 +50,7 @@
//TODO: provide a mechanism to override the services
$this->guidValidator =
WikibaseRepo::getDefaultInstance()->getClaimGuidValidator();
- $this->guidParser =
WikibaseRepo::getDefaultInstance()->getClaimGuidParser();
+ $this->guidParser =
WikibaseRepo::getDefaultInstance()->getStatementGuidParser();
}
/**
diff --git a/repo/includes/api/ModifyClaim.php
b/repo/includes/api/ModifyClaim.php
index da2acb2..5e41650 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -4,7 +4,7 @@
use ApiBase;
use ApiMain;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
@@ -30,7 +30,7 @@
/**
* @since 0.5
*
- * @var ClaimGuidParser
+ * @var StatementGuidParser
*/
protected $guidParser;
@@ -51,7 +51,7 @@
$this->getErrorReporter()
);
- $this->guidParser =
WikibaseRepo::getDefaultInstance()->getClaimGuidParser();
+ $this->guidParser =
WikibaseRepo::getDefaultInstance()->getStatementGuidParser();
}
/**
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
index 6f9281f..d71fb8a 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
@@ -5,7 +5,6 @@
use DataValues\NumberValue;
use DataValues\StringValue;
use Wikibase\ChangeOp\ChangeOpStatement;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
@@ -20,6 +19,7 @@
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Lib\ClaimGuidValidator;
@@ -273,7 +273,7 @@
$statement,
new ClaimGuidGenerator(),
new ClaimGuidValidator( $idParser ),
- new ClaimGuidParser( $idParser ),
+ new StatementGuidParser( $idParser ),
$this->mockProvider->getMockSnakValidator(),
$index
);
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index d635d38..789629e 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -14,7 +14,7 @@
use ValueValidators\Result;
use ValueValidators\ValueValidator;
use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\ClaimGuidParser;
+use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
@@ -249,12 +249,12 @@
}
/**
- * Returns a mock ClaimGuidParser that will return the same ClaimGuid
for
+ * Returns a mock StatementGuidParser that will return the same
ClaimGuid for
* all input strings.
*
* @param EntityId $entityId
*
- * @return ClaimGuidParser
+ * @return StatementGuidParser
*/
public function getMockGuidParser( EntityId $entityId ) {
$mockClaimGuid = $this->getMockBuilder(
'Wikibase\DataModel\Claim\ClaimGuid' )
@@ -267,7 +267,7 @@
->method( 'getEntityId' )
->will( PHPUnit_Framework_TestCase::returnValue(
$entityId ) );
- $mock = $this->getMockBuilder(
'Wikibase\DataModel\Claim\ClaimGuidParser' )
+ $mock = $this->getMockBuilder(
'Wikibase\DataModel\Statement\StatementGuidParser' )
->disableOriginalConstructor()
->getMock();
$mock->expects( PHPUnit_Framework_TestCase::any() )
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index d679229..5d88e42 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -79,9 +79,9 @@
$this->assertInstanceOf(
'Wikibase\DataModel\Entity\EntityIdParser', $returnValue );
}
- public function testGetClaimGuidParser() {
- $returnValue = $this->getWikibaseRepo()->getClaimGuidParser();
- $this->assertInstanceOf(
'Wikibase\DataModel\Claim\ClaimGuidParser', $returnValue );
+ public function testGetStatementGuidParser() {
+ $returnValue =
$this->getWikibaseRepo()->getStatementGuidParser();
+ $this->assertInstanceOf(
'Wikibase\DataModel\Statement\StatementGuidParser', $returnValue );
}
public function testGetLanguageFallbackChainFactory() {
--
To view, visit https://gerrit.wikimedia.org/r/220389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife431ec7b98de49c0af0c0ccd40c2e606dc0fb9b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
