jenkins-bot has submitted this change and it was merged.
Change subject: Rename ChangeOpClaim to ChangeOpMainSnak
......................................................................
Rename ChangeOpClaim to ChangeOpMainSnak
- as suggested by DanielK
- is a more suitable name
Change-Id: I5bbbfc408569733897e2a35fbe84426d2d0e95b3
---
M repo/Wikibase.classes.php
M repo/includes/api/CreateClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/SetClaimValue.php
R repo/includes/changeop/ChangeOpMainSnak.php
R repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
6 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index f9dd4fd..35c4d24 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -57,7 +57,7 @@
'Wikibase\ChangeOpDescription' =>
'includes/changeop/ChangeOpDescription.php',
'Wikibase\ChangeOpAliases' =>
'includes/changeop/ChangeOpAliases.php',
'Wikibase\ChangeOpSiteLink' =>
'includes/changeop/ChangeOpSiteLink.php',
- 'Wikibase\ChangeOpClaim' =>
'includes/changeop/ChangeOpClaim.php',
+ 'Wikibase\ChangeOpMainSnak' =>
'includes/changeop/ChangeOpMainSnak.php',
// includes/actions
'Wikibase\HistoryEntityAction' =>
'includes/actions/HistoryEntityAction.php',
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index b5bde02..46ce10f 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -7,7 +7,7 @@
use Wikibase\EntityId;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Claims;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOpMainSnak;
use Wikibase\Validators\ValidatorErrorLocalizer;
use ValueParsers\ParseException;
@@ -86,7 +86,7 @@
$this->snakValidation->validateSnak( $snak );
$summary = $this->claimModificationHelper->createSummary(
$params, $this );
- $changeOp = new ChangeOpClaim( '', $snak,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
+ $changeOp = new ChangeOpMainSnak( '', $snak,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
$changeOp->apply( $entity, $summary );
$claims = new Claims( $entity->getClaims() );
$claim = $claims->getClaimWithGuid( $changeOp->getClaimGuid() );
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 8a8ef93..0e006f0 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -10,7 +10,7 @@
use Wikibase\Entity;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\ChangeOps;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOpMainSnak;
/**
* API module for removing claims.
@@ -127,7 +127,7 @@
$changeOps = array();
foreach ( $params['claim'] as $guid ) {
- $changeOps[] = new ChangeOpClaim( $guid, null,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
+ $changeOps[] = new ChangeOpMainSnak( $guid, null,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
}
return $changeOps;
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index f2d1de1..626680c 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -7,7 +7,7 @@
use Wikibase\EntityId;
use Wikibase\Entity;
use Wikibase\Claims;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOpMainSnak;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -69,7 +69,7 @@
$snak = $this->claimModificationHelper->getSnakInstance(
$params, $claim->getMainSnak()->getPropertyId() );
$summary = $this->claimModificationHelper->createSummary(
$params, $this );
- $changeOp = new ChangeOpClaim( $claimGuid, $snak,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
+ $changeOp = new ChangeOpMainSnak( $claimGuid, $snak,
WikibaseRepo::getDefaultInstance()->getIdFormatter() );
$changeOp->apply( $entity, $summary );
$this->saveChanges( $entityContent, $summary );
diff --git a/repo/includes/changeop/ChangeOpClaim.php
b/repo/includes/changeop/ChangeOpMainSnak.php
similarity index 92%
rename from repo/includes/changeop/ChangeOpClaim.php
rename to repo/includes/changeop/ChangeOpMainSnak.php
index f459848..59a4a37 100644
--- a/repo/includes/changeop/ChangeOpClaim.php
+++ b/repo/includes/changeop/ChangeOpMainSnak.php
@@ -7,7 +7,7 @@
use Wikibase\Lib\EntityIdFormatter;
/**
- * Class for claim change operation
+ * Class for mainsnak change operation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
* @licence GNU GPL v2+
* @author Tobias Gritschacher < [email protected] >
*/
-class ChangeOpClaim extends ChangeOp {
+class ChangeOpMainSnak extends ChangeOp {
/**
* @since 0.4
@@ -55,7 +55,7 @@
protected $idFormatter;
/**
- * Constructs a new claim change operation
+ * Constructs a new mainsnak change operation
*
* @since 0.4
*
@@ -91,8 +91,8 @@
* Applies the change to the given entity
*
* - the claim gets removed when $claimGuid is set and $snak is not set
- * - a new claim with $snak gets added when $claimGuid is empty and
$snak is set
- * - the claim's main snak gets set to $snak when $claimGuid and $snak
are set
+ * - a new claim with $snak as mainsnak gets added when $claimGuid is
empty and $snak is set
+ * - the claim's mainsnak gets set to $snak when $claimGuid and $snak
are set
*
* @since 0.4
*
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
similarity index 89%
rename from repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
rename to repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
index 62ce065..337ec4d 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
@@ -3,14 +3,14 @@
namespace Wikibase\Test;
use Wikibase\Claims;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOpMainSnak;
use Wikibase\ItemContent;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Lib\ClaimGuidGenerator;
use InvalidArgumentException;
/**
- * @covers Wikibase\ChangeOpClaim
+ * @covers Wikibase\ChangeOpMainSnak
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@
* @licence GNU GPL v2+
* @author Tobias Gritschacher < [email protected] >
*/
-class ChangeOpClaimTest extends \PHPUnit_Framework_TestCase {
+class ChangeOpMainSnakTest extends \PHPUnit_Framework_TestCase {
public function invalidArgumentProvider() {
$item = ItemContent::newFromArray( array( 'entity' => 'q42' )
)->getEntity();
@@ -64,7 +64,7 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct( $claimGuid, $snak, $idFormatter )
{
- $changeOpClaim = new ChangeOpClaim( $claimGuid, $snak,
$idFormatter );
+ $ChangeOpMainSnak = new ChangeOpMainSnak( $claimGuid, $snak,
$idFormatter );
}
public function changeOpProvider() {
@@ -75,7 +75,7 @@
$item = $this->provideNewItemWithClaim( 'q123', $snak );
$newSnak = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newSnak' ) );
$claimGuid = '';
- $changeOp = new ChangeOpClaim( $claimGuid, $newSnak,
$idFormatter );
+ $changeOp = new ChangeOpMainSnak( $claimGuid, $newSnak,
$idFormatter );
$expected = $newSnak->getDataValue();
$args[] = array ( $item, $changeOp, $expected );
@@ -83,14 +83,14 @@
$newSnak = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'changedSnak' ) );
$claims = $item->getClaims();
$claimGuid = $claims[0]->getGuid();
- $changeOp = new ChangeOpClaim( $claimGuid, $newSnak,
$idFormatter );
+ $changeOp = new ChangeOpMainSnak( $claimGuid, $newSnak,
$idFormatter );
$expected = $newSnak->getDataValue();
$args[] = array ( $item, $changeOp, $expected );
$item = $this->provideNewItemWithClaim( 'q345', $snak );
$claims = $item->getClaims();
$claimGuid = $claims[0]->getGuid();
- $changeOp = new ChangeOpClaim( $claimGuid, null, $idFormatter );
+ $changeOp = new ChangeOpMainSnak( $claimGuid, null,
$idFormatter );
$expected = null;
$args[] = array ( $item, $changeOp, $expected );
@@ -101,7 +101,7 @@
* @dataProvider changeOpProvider
*
* @param Entity $item
- * @param ChangeOpClaim $changeOp
+ * @param ChangeOpMainSnak $changeOp
* @param DataValue|null $expected
*/
public function testApplyAddNewClaim( $item, $changeOp, $expected ) {
--
To view, visit https://gerrit.wikimedia.org/r/77347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bbbfc408569733897e2a35fbe84426d2d0e95b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
