jenkins-bot has submitted this change and it was merged.
Change subject: Rename ChangeOpClaimRemove to ChangeOpStatementRemove
......................................................................
Rename ChangeOpClaimRemove to ChangeOpStatementRemove
As requested by Addshore in Id8361ad.
Bug: T87388
Change-Id: Ie32a8dfa7ebae1f4b093d927202a233e11de3e16
---
R repo/includes/ChangeOp/ChangeOpRemoveStatement.php
M repo/includes/ChangeOp/ChangeOpsMerge.php
M repo/includes/ChangeOp/ClaimChangeOpFactory.php
M repo/includes/api/EditEntity.php
M repo/includes/api/RemoveClaims.php
R repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M repo/tests/phpunit/includes/ChangeOp/ClaimChangeOpFactoryTest.php
7 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
b/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
similarity index 96%
rename from repo/includes/ChangeOp/ChangeOpClaimRemove.php
rename to repo/includes/ChangeOp/ChangeOpRemoveStatement.php
index f9be42e..26e66f2 100644
--- a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
@@ -21,7 +21,7 @@
* @author Adam Shorland
* @author Thiemo Mättig
*/
-class ChangeOpClaimRemove extends ChangeOpBase {
+class ChangeOpRemoveStatement extends ChangeOpBase {
/**
* @var string
@@ -31,7 +31,7 @@
/**
* @return string
*/
- public function getClaimGuid() {
+ public function getStatementGuid() {
return $this->guid;
}
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 2fb0f3b..8e909be 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -266,7 +266,7 @@
private function generateClaimsChangeOps() {
foreach ( $this->fromItem->getClaims() as $fromClaim ) {
- $this->fromChangeOps->add(
$this->getClaimChangeOpFactory()->newRemoveClaimOp( $fromClaim->getGuid() ) );
+ $this->fromChangeOps->add(
$this->getClaimChangeOpFactory()->newRemoveStatementOp( $fromClaim->getGuid() )
);
$toClaim = clone $fromClaim;
$toClaim->setGuid( null );
diff --git a/repo/includes/ChangeOp/ClaimChangeOpFactory.php
b/repo/includes/ChangeOp/ClaimChangeOpFactory.php
index 026de21..e20801c 100644
--- a/repo/includes/ChangeOp/ClaimChangeOpFactory.php
+++ b/repo/includes/ChangeOp/ClaimChangeOpFactory.php
@@ -100,8 +100,8 @@
* @throws InvalidArgumentException
* @return ChangeOp
*/
- public function newRemoveClaimOp( $claimGuid ) {
- return new ChangeOpClaimRemove( $claimGuid );
+ public function newRemoveStatementOp( $claimGuid ) {
+ return new ChangeOpRemoveStatement( $claimGuid );
}
/**
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 1fb7952..e2807d5 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -444,7 +444,7 @@
}
/**
- * @param array $claims
+ * @param array[] $claims
*
* @return ChangeOp[]
*/
@@ -458,12 +458,12 @@
if ( array_keys( $claims ) !== range( 0, count( $claims ) - 1 )
) {
foreach ( $claims as $subClaims ) {
$changeOps = array_merge( $changeOps,
- $this->getRemoveClaimsChangeOps(
$subClaims ),
+ $this->getRemoveStatementChangeOps(
$subClaims ),
$this->getModifyClaimsChangeOps(
$subClaims ) );
}
} else {
$changeOps = array_merge( $changeOps,
- $this->getRemoveClaimsChangeOps( $claims ),
+ $this->getRemoveStatementChangeOps( $claims ),
$this->getModifyClaimsChangeOps( $claims ) );
}
@@ -471,7 +471,7 @@
}
/**
- * @param array $claims array of serialized claims
+ * @param array[] $claims array of serialized claims
*
* @return ChangeOp[]
*/
@@ -504,16 +504,16 @@
/**
* Get changeops that remove all claims that have the 'remove' key in
the array
*
- * @param array $claims array of serialized claims
+ * @param array[] $claims array of serialized claims
*
* @return ChangeOp[]
*/
- private function getRemoveClaimsChangeOps( array $claims ) {
+ private function getRemoveStatementChangeOps( array $claims ) {
$opsToReturn = array();
foreach ( $claims as $claimArray ) {
if ( array_key_exists( 'remove', $claimArray ) ) {
if ( array_key_exists( 'id', $claimArray ) ) {
- $opsToReturn[] =
$this->claimChangeOpFactory->newRemoveClaimOp( $claimArray['id'] );
+ $opsToReturn[] =
$this->claimChangeOpFactory->newRemoveStatementOp( $claimArray['id'] );
} else {
$this->dieError( 'Cannot remove a claim
with no GUID', 'invalid-claim' );
}
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 758ea09..33be84c 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -133,7 +133,7 @@
$changeOps = array();
foreach ( $params['claim'] as $guid ) {
- $changeOps[] =
$this->claimChangeOpFactory->newRemoveClaimOp( $guid );
+ $changeOps[] =
$this->claimChangeOpFactory->newRemoveStatementOp( $guid );
}
return $changeOps;
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
similarity index 74%
rename from repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
rename to repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
index 7c37145..a041dbb 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
@@ -5,7 +5,7 @@
use DataValues\DataValue;
use DataValues\StringValue;
use InvalidArgumentException;
-use Wikibase\ChangeOp\ChangeOpClaimRemove;
+use Wikibase\ChangeOp\ChangeOpRemoveStatement;
use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -13,7 +13,7 @@
use Wikibase\DataModel\Statement\Statement;
/**
- * @covers Wikibase\ChangeOp\ChangeOpClaimRemove
+ * @covers Wikibase\ChangeOp\ChangeOpRemoveStatement
*
* @group Wikibase
* @group WikibaseRepo
@@ -22,7 +22,7 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class ChangeOpClaimRemoveTest extends \PHPUnit_Framework_TestCase {
+class ChangeOpRemoveStatementTest extends \PHPUnit_Framework_TestCase {
public function invalidConstructorProvider() {
$args = array();
@@ -36,13 +36,13 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct( $claimGuid ) {
- new ChangeOpClaimRemove( $claimGuid );
+ new ChangeOpRemoveStatement( $claimGuid );
}
public function testGetClaimGuid() {
$claimguid = 'foobar';
- $changeop = new ChangeOpClaimRemove( $claimguid );
- $this->assertEquals( $claimguid, $changeop->getClaimGuid() );
+ $changeop = new ChangeOpRemoveStatement( $claimguid );
+ $this->assertEquals( $claimguid, $changeop->getStatementGuid()
);
}
public function changeOpProvider() {
@@ -54,7 +54,7 @@
/** @var Statement $statement */
$statement = reset( $statements );
$guid = $statement->getGuid();
- $changeOp = new ChangeOpClaimRemove( $guid );
+ $changeOp = new ChangeOpRemoveStatement( $guid );
$expected = null;
$args[] = array ( $item, $changeOp, $expected );
@@ -64,11 +64,11 @@
/**
* @dataProvider changeOpProvider
*/
- public function testApplyAddNewClaim( Item $item, ChangeOpClaimRemove
$changeOp, DataValue $expected = null ) {
+ public function testApplyAddNewClaim( Item $item,
ChangeOpRemoveStatement $changeOp, DataValue $expected = null ) {
$this->assertTrue( $changeOp->apply( $item ), "Applying the
ChangeOp did not return true" );
- $this->assertNotEmpty( $changeOp->getClaimGuid() );
+ $this->assertNotEmpty( $changeOp->getStatementGuid() );
$claims = new Claims( $item->getClaims() );
- $this->assertEquals( $expected, $claims->getClaimWithGuid(
$changeOp->getClaimGuid() ) );
+ $this->assertEquals( $expected, $claims->getClaimWithGuid(
$changeOp->getStatementGuid() ) );
}
private function newItemWithClaim( $itemIdString, $snak ) {
diff --git a/repo/tests/phpunit/includes/ChangeOp/ClaimChangeOpFactoryTest.php
b/repo/tests/phpunit/includes/ChangeOp/ClaimChangeOpFactoryTest.php
index 600229a..3030fd6 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ClaimChangeOpFactoryTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ClaimChangeOpFactoryTest.php
@@ -51,8 +51,8 @@
$this->assertInstanceOf( 'Wikibase\ChangeOp\ChangeOp', $op );
}
- public function testNewRemoveClaimOp() {
- $op = $this->newChangeOpFactory()->newRemoveClaimOp( 'DEADBEEF'
);
+ public function testNewRemoveStatementOp() {
+ $op = $this->newChangeOpFactory()->newRemoveStatementOp(
'DEADBEEF' );
$this->assertInstanceOf( 'Wikibase\ChangeOp\ChangeOp', $op );
}
--
To view, visit https://gerrit.wikimedia.org/r/216659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie32a8dfa7ebae1f4b093d927202a233e11de3e16
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
