jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup ChangeOp related files.
......................................................................
Cleanup ChangeOp related files.
Change-Id: I568e71ba24299a3768a4325a54e17de48d300ecc
---
M repo/includes/ChangeOp/ChangeOp.php
M repo/includes/ChangeOp/ChangeOpAliases.php
M repo/includes/ChangeOp/ChangeOpClaim.php
M repo/includes/ChangeOp/ChangeOpDescription.php
M repo/includes/ChangeOp/ChangeOpLabel.php
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ChangeOp/ChangeOps.php
M repo/includes/ChangeOp/ChangeOpsMerge.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
23 files changed, 126 insertions(+), 101 deletions(-)
Approvals:
Daniel Kinzler: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ChangeOp/ChangeOp.php
b/repo/includes/ChangeOp/ChangeOp.php
index b3b6a92..50e53fb 100644
--- a/repo/includes/ChangeOp/ChangeOp.php
+++ b/repo/includes/ChangeOp/ChangeOp.php
@@ -2,7 +2,7 @@
namespace Wikibase\ChangeOp;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpAliases.php
b/repo/includes/ChangeOp/ChangeOpAliases.php
index 3c905d3..b20be57 100644
--- a/repo/includes/ChangeOp/ChangeOpAliases.php
+++ b/repo/includes/ChangeOp/ChangeOpAliases.php
@@ -3,7 +3,7 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpClaim.php
b/repo/includes/ChangeOp/ChangeOpClaim.php
index 00f0ad7..fbaf937 100644
--- a/repo/includes/ChangeOp/ChangeOpClaim.php
+++ b/repo/includes/ChangeOp/ChangeOpClaim.php
@@ -3,10 +3,10 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\ByPropertyIdArray;
-use Wikibase\Claim;
-use Wikibase\Claims;
-use Wikibase\Entity;
+use Wikibase\DataModel\ByPropertyIdArray;
+use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
diff --git a/repo/includes/ChangeOp/ChangeOpDescription.php
b/repo/includes/ChangeOp/ChangeOpDescription.php
index 37934c9..39e7bbd 100644
--- a/repo/includes/ChangeOp/ChangeOpDescription.php
+++ b/repo/includes/ChangeOp/ChangeOpDescription.php
@@ -3,7 +3,7 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpLabel.php
b/repo/includes/ChangeOp/ChangeOpLabel.php
index 37ada71..c278e5f 100644
--- a/repo/includes/ChangeOp/ChangeOpLabel.php
+++ b/repo/includes/ChangeOp/ChangeOpLabel.php
@@ -3,7 +3,7 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index e4d5d78..3e9eabc 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -3,11 +3,10 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\ClaimGuidGenerator;
-use Wikibase\Claims;
-use Wikibase\Entity;
-use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Snak;
use Wikibase\Summary;
/**
@@ -40,9 +39,9 @@
*
* @param string $claimGuid
* @param Snak|null $snak
- * @param EntityIdFormatter $idFormatter
* @param ClaimGuidGenerator $guidGenerator
- * @throws \InvalidArgumentException
+ *
+ * @throws InvalidArgumentException
*/
public function __construct( $claimGuid, $snak, ClaimGuidGenerator
$guidGenerator ) {
if ( !is_string( $claimGuid ) ) {
@@ -62,6 +61,9 @@
$this->guidGenerator = $guidGenerator;
}
+ /**
+ * @return string
+ */
public function getClaimGuid() {
return $this->claimGuid;
}
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index d41d9f9..12df5a0 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -3,10 +3,10 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Claims;
-use Wikibase\Entity;
-use Wikibase\Snak;
-use Wikibase\Snaks;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\Snak;
+use Wikibase\DataModel\Snak\Snaks;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpReference.php
b/repo/includes/ChangeOp/ChangeOpReference.php
index b77b265..21144e8 100644
--- a/repo/includes/ChangeOp/ChangeOpReference.php
+++ b/repo/includes/ChangeOp/ChangeOpReference.php
@@ -3,12 +3,12 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Claims;
-use Wikibase\Entity;
-use Wikibase\Reference;
-use Wikibase\References;
-use Wikibase\Snak;
-use Wikibase\Statement;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Reference;
+use Wikibase\DataModel\References;
+use Wikibase\DataModel\Snak\Snak;
use Wikibase\Summary;
/**
@@ -58,7 +58,7 @@
* @param string $referenceHash
* @param int|null $index
*
- * @throws \InvalidArgumentException
+ * @throws InvalidArgumentException
*/
public function __construct( $claimGuid, $reference, $referenceHash,
$index = null ) {
if ( !is_string( $claimGuid ) || $claimGuid === '' ) {
@@ -187,7 +187,6 @@
if ( !$references->hasReferenceHash( $this->referenceHash ) ) {
throw new ChangeOpException( "Reference with hash
$this->referenceHash does not exist" );
}
- $removedReference = $references->getReference(
$this->referenceHash );
$references->removeReferenceHash( $this->referenceHash );
$this->updateSummary( $summary, 'remove' );
if ( $summary !== null ) {
diff --git a/repo/includes/ChangeOp/ChangeOpSiteLink.php
b/repo/includes/ChangeOp/ChangeOpSiteLink.php
index b692eb7..e71a691 100644
--- a/repo/includes/ChangeOp/ChangeOpSiteLink.php
+++ b/repo/includes/ChangeOp/ChangeOpSiteLink.php
@@ -3,10 +3,10 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Entity;
-use Wikibase\Item;
+use Wikibase\DataModel\SiteLink;
use Wikibase\Summary;
/**
@@ -46,6 +46,7 @@
*
* @param string $siteId
* @param string|null $pageName Null in case the link with the provided
siteId should be removed
+ * @param array|null $badges
*
* @throws InvalidArgumentException
*/
@@ -163,7 +164,7 @@
$this->updateSummary( $summary, $action, $this->siteId,
$commentArgs );
- $entity->addSiteLink( new SimpleSiteLink(
$this->siteId, $pageName, $badges ) );
+ $entity->addSiteLink( new SiteLink( $this->siteId,
$pageName, $badges ) );
}
return true;
diff --git a/repo/includes/ChangeOp/ChangeOpStatementRank.php
b/repo/includes/ChangeOp/ChangeOpStatementRank.php
index 109c99a..155b696 100644
--- a/repo/includes/ChangeOp/ChangeOpStatementRank.php
+++ b/repo/includes/ChangeOp/ChangeOpStatementRank.php
@@ -3,10 +3,10 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Claims;
-use Wikibase\Entity;
-use Wikibase\Snak;
-use Wikibase\Statement;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\Serializers\ClaimSerializer;
use Wikibase\Summary;
diff --git a/repo/includes/ChangeOp/ChangeOps.php
b/repo/includes/ChangeOp/ChangeOps.php
index 49cf1a0..d5434f8 100644
--- a/repo/includes/ChangeOp/ChangeOps.php
+++ b/repo/includes/ChangeOp/ChangeOps.php
@@ -3,7 +3,7 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\Summary;
/**
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 0b31693..2e5bef9 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -40,6 +40,11 @@
$this->ignoreConflicts = $ignoreConflicts;
}
+ /**
+ * @param array $ignoreConflicts can contain strings 'label',
'description', 'sitelink'
+ *
+ * @throws InvalidArgumentException
+ */
private function assertValidIgnoreConflictValues( $ignoreConflicts ) {
if( !is_array( $ignoreConflicts ) ){
throw new InvalidArgumentException( '$ignoreConflicts
must be an array' );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
index 1fd16c6..cdee86a 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
@@ -3,7 +3,7 @@
namespace Wikibase\Test;
use Wikibase\ChangeOp\ChangeOpAliases;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
use Wikibase\ItemContent;
use InvalidArgumentException;
@@ -38,7 +38,7 @@
* @param string $action
*/
public function testInvalidConstruct( $language, $aliases, $action ) {
- $changeOpLabel = new ChangeOpAliases( $language, $aliases,
$action );
+ new ChangeOpAliases( $language, $aliases, $action );
}
public function changeOpAliasesProvider() {
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
index a90b296..ccfd1f6 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
@@ -3,15 +3,15 @@
namespace Wikibase\Test;
use Wikibase\ChangeOp\ChangeOpClaim;
-use Wikibase\Claim;
-use Wikibase\Claims;
+use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Entity;
-use Wikibase\Item;
use InvalidArgumentException;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\Lib\ClaimGuidGenerator;
-use Wikibase\PropertyNoValueSnak;
-use Wikibase\PropertySomeValueSnak;
/**
* @covers Wikibase\ChangeOp\ChangeOpClaim
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
index a85b288..30aec6c 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
@@ -26,7 +26,7 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct() {
- $changeOpDescription = new ChangeOpDescription( 42, 'myOld' );
+ new ChangeOpDescription( 42, 'myOld' );
}
public function changeOpDescriptionProvider() {
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
index d635d2d..ebe20d0 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
@@ -26,7 +26,7 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct() {
- $changeOpLabel = new ChangeOpLabel( 42, 'myNew' );
+ new ChangeOpLabel( 42, 'myNew' );
}
public function changeOpLabelProvider() {
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index b35d29d..f749f39 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -3,10 +3,12 @@
namespace Wikibase\Test;
use DataValues\DataValue;
+use DataValues\StringValue;
use Wikibase\ChangeOp\ChangeOp;
-use Wikibase\Claims;
use Wikibase\ChangeOp\ChangeOpMainSnak;
-use Wikibase\Entity;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\ItemContent;
use Wikibase\Lib\ClaimGuidGenerator;
use InvalidArgumentException;
@@ -29,9 +31,9 @@
public function invalidArgumentProvider() {
$item = ItemContent::newFromArray( array( 'entity' => 'q42' )
)->getEntity();
$validGuidGenerator = new ClaimGuidGenerator( $item->getId() );
- $guidGenerator = new \Wikibase\Lib\ClaimGuidGenerator(
$item->getId() );
+ $guidGenerator = new ClaimGuidGenerator( $item->getId() );
$validClaimGuid = $guidGenerator->newGuid();
- $validSnak = new \Wikibase\PropertyValueSnak( 7201010, new
\DataValues\StringValue( 'o_O' ) );
+ $validSnak = new PropertyValueSnak( 7201010, new StringValue(
'o_O' ) );
$args = array();
$args[] = array( 123, $validSnak, $validGuidGenerator );
@@ -49,22 +51,22 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct( $claimGuid, $snak, $guidGenerator
) {
- $ChangeOpMainSnak = new ChangeOpMainSnak( $claimGuid, $snak,
$guidGenerator );
+ new ChangeOpMainSnak( $claimGuid, $snak, $guidGenerator );
}
public function changeOpProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
- $newSnak = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newSnak' ) );
+ $newSnak = new PropertyValueSnak( 78462378, new StringValue(
'newSnak' ) );
$claimGuid = '';
$changeOp = new ChangeOpMainSnak( $claimGuid, $newSnak, new
ClaimGuidGenerator( $item->getId() ) );
$expected = $newSnak->getDataValue();
$args[] = array ( $item, $changeOp, $expected );
$item = $this->provideNewItemWithClaim( 'q234', $snak );
- $newSnak = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'changedSnak' ) );
+ $newSnak = new PropertyValueSnak( 78462378, new StringValue(
'changedSnak' ) );
$claims = $item->getClaims();
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
@@ -102,8 +104,8 @@
}
public function provideChangeOps() {
- $snak = new \Wikibase\PropertyValueSnak( 67573284, new
\DataValues\StringValue( 'test' ) );
- $newSnak = new \Wikibase\PropertyValueSnak( 12651236, new
\DataValues\StringValue( 'newww' ) );
+ $snak = new PropertyValueSnak( 67573284, new StringValue(
'test' ) );
+ $newSnak = new PropertyValueSnak( 12651236, new StringValue(
'newww' ) );
$item = $this->provideNewItemWithClaim( 'q777', $snak );
$claims = $item->getClaims();
$claim = reset( $claims );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
index 1f7cf48..f17516c 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
@@ -2,11 +2,14 @@
namespace Wikibase\Test;
-use Wikibase\Claims;
+use DataValues\StringValue;
use Wikibase\ChangeOp\ChangeOpQualifier;
-use Wikibase\Entity;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\ItemContent;
use InvalidArgumentException;
+use Wikibase\Lib\ClaimGuidGenerator;
/**
* @covers Wikibase\ChangeOp\ChangeOpQualifier
@@ -24,9 +27,9 @@
public function invalidArgumentProvider() {
$item = ItemContent::newFromArray( array( 'entity' => 'q42' )
)->getEntity();
- $guidGenerator = new \Wikibase\Lib\ClaimGuidGenerator(
$item->getId() );
+ $guidGenerator = new ClaimGuidGenerator( $item->getId() );
$validClaimGuid = $guidGenerator->newGuid();
- $validSnak = new \Wikibase\PropertyValueSnak( 7201010, new
\DataValues\StringValue( 'o_O' ) );
+ $validSnak = new PropertyValueSnak( 7201010, new StringValue(
'o_O' ) );
$validSnakHash = $validSnak->getHash();
$args = array();
@@ -51,14 +54,14 @@
}
public function changeOpAddProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
$claims = $item->getClaims();
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
- $newQualifier = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $newQualifier = new PropertyValueSnak( 78462378, new
StringValue( 'newQualifier' ) );
$changeOp = new ChangeOpQualifier( $claimGuid, $newQualifier,
'' );
$snakHash = $newQualifier->getHash();
$args[] = array ( $item, $changeOp, $snakHash );
@@ -82,14 +85,14 @@
}
public function changeOpRemoveProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q345', $snak );
$claims = $item->getClaims();
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
- $newQualifier = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $newQualifier = new PropertyValueSnak( 78462378, new
StringValue( 'newQualifier' ) );
$qualifiers = $claim->getQualifiers();
$qualifiers->addSnak( $newQualifier );
$claim->setQualifiers( $qualifiers );
@@ -117,20 +120,20 @@
}
public function changeOpSetProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
$claims = $item->getClaims();
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
- $newQualifier = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $newQualifier = new PropertyValueSnak( 78462378, new
StringValue( 'newQualifier' ) );
$qualifiers = $claim->getQualifiers();
$qualifiers->addSnak( $newQualifier );
$claim->setQualifiers( $qualifiers );
$item->setClaims( new Claims( $claims ) );
$snakHash = $newQualifier->getHash();
- $changedQualifier = new \Wikibase\PropertyValueSnak( 78462378,
new \DataValues\StringValue( 'changedQualifier' ) );
+ $changedQualifier = new PropertyValueSnak( 78462378, new
StringValue( 'changedQualifier' ) );
$changeOp = new ChangeOpQualifier( $claimGuid,
$changedQualifier, $snakHash );
$args[] = array ( $item, $changeOp,
$changedQualifier->getHash() );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
index 18a83cd..cb436f3 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
@@ -2,15 +2,19 @@
namespace Wikibase\Test;
+use DataValues\StringValue;
use LogicException;
-use Wikibase\Claims;
use Wikibase\ChangeOp\ChangeOpReference;
-use Wikibase\Entity;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Reference;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\DataModel\Snak\SnakList;
use Wikibase\ItemContent;
-use Wikibase\PropertyNoValueSnak;
-use Wikibase\Reference;
-use Wikibase\SnakList;
use InvalidArgumentException;
+use Wikibase\Lib\ClaimGuidGenerator;
/**
* @covers Wikibase\ChangeOp\ChangeOpReference
@@ -28,10 +32,10 @@
public function invalidArgumentProvider() {
$item = ItemContent::newFromArray( array( 'entity' => 'q42' )
)->getEntity();
- $guidGenerator = new \Wikibase\Lib\ClaimGuidGenerator(
$item->getId() );
+ $guidGenerator = new ClaimGuidGenerator( $item->getId() );
$validClaimGuid = $guidGenerator->newGuid();
$snaks = new SnakList();
- $snaks[] = new \Wikibase\PropertyValueSnak( 7201010, new
\DataValues\StringValue( 'o_O' ) );
+ $snaks[] = new PropertyValueSnak( 7201010, new StringValue(
'o_O' ) );
$validReference = new Reference( $snaks );
$validReferenceHash = $validReference->getHash();
@@ -58,7 +62,7 @@
}
public function changeOpAddProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
@@ -66,7 +70,7 @@
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
$snaks = new SnakList();
- $snaks[] = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $snaks[] = new PropertyValueSnak( 78462378, new StringValue(
'newQualifier' ) );
$newReference = new Reference( $snaks );
$changeOp = new ChangeOpReference( $claimGuid, $newReference,
'' );
$referenceHash = $newReference->getHash();
@@ -85,6 +89,7 @@
public function testApplyAddNewReference( $item, $changeOp,
$referenceHash ) {
$this->assertTrue( $changeOp->apply( $item ), "Applying the
ChangeOp did not return true" );
$claims = $item->getClaims();
+ /** @var Statement $claim */
$claim = reset( $claims );
$references = $claim->getReferences();
$this->assertTrue( $references->hasReferenceHash(
$referenceHash ), "No reference with expected hash" );
@@ -96,6 +101,7 @@
$item = $this->provideNewItemWithClaim( 'q123', $snak );
$claims = $item->getClaims();
+ /** @var Statement $claim */
$claim = reset( $claims );
$references = array(
@@ -144,21 +150,23 @@
) {
$this->assertTrue( $changeOp->apply( $item ), 'Applying the
ChangeOp did not return true' );
$claims = new Claims( $item->getClaims() );
+ /** @var Statement $claim */
$claim = reset( $claims );
$references = $claim->getReferences();
$this->assertEquals( $expectedIndex, $references->indexOf(
$newReference ) );
}
public function changeOpRemoveProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q345', $snak );
$claims = $item->getClaims();
+ /** @var Statement $claim */
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
$snaks = new SnakList();
- $snaks[] = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $snaks[] = new PropertyValueSnak( 78462378, new StringValue(
'newQualifier' ) );
$newReference = new Reference( $snaks );
$references = $claim->getReferences();
$references->addReference( $newReference );
@@ -181,21 +189,23 @@
public function testApplyRemoveReference( $item, $changeOp,
$referenceHash ) {
$this->assertTrue( $changeOp->apply( $item ), "Applying the
ChangeOp did not return true" );
$claims = $item->getClaims();
+ /** @var Statement $claim */
$claim = reset( $claims );
$references = $claim->getReferences();
$this->assertFalse( $references->hasReferenceHash(
$referenceHash ), "Reference still exists" );
}
public function changeOpSetProvider() {
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
$claims = $item->getClaims();
+ /** @var Statement $claim */
$claim = reset( $claims );
$claimGuid = $claim->getGuid();
$snaks = new SnakList();
- $snaks[] = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'newQualifier' ) );
+ $snaks[] = new PropertyValueSnak( 78462378, new StringValue(
'newQualifier' ) );
$newReference = new Reference( $snaks );
$references = $claim->getReferences();
$references->addReference( $newReference );
@@ -203,7 +213,7 @@
$item->setClaims( new Claims( $claims ) );
$referenceHash = $newReference->getHash();
$snaks = new SnakList();
- $snaks[] = new \Wikibase\PropertyValueSnak( 78462378, new
\DataValues\StringValue( 'changedQualifier' ) );
+ $snaks[] = new PropertyValueSnak( 78462378, new StringValue(
'changedQualifier' ) );
$changedReference = new Reference( $snaks );
$changeOp = new ChangeOpReference( $claimGuid,
$changedReference, $referenceHash );
$args[] = array ( $item, $changeOp,
$changedReference->getHash() );
@@ -213,6 +223,7 @@
$claims = $item->getClaims();
$claim = reset( $claims );
+ /** @var Reference[] $references */
$references = array(
new Reference( new SnakList( array( new
PropertyNoValueSnak( 1 ) ) ) ),
new Reference( new SnakList( array( new
PropertyNoValueSnak( 2 ) ) ) ),
@@ -245,6 +256,7 @@
public function testApplySetReference( $item, $changeOp, $referenceHash
) {
$this->assertTrue( $changeOp->apply( $item ), "Applying the
ChangeOp did not return true" );
$claims = new Claims( $item->getClaims() );
+ /** @var Statement $claim */
$claim = reset( $claims );
$references = $claim->getReferences();
$this->assertTrue( $references->hasReferenceHash(
$referenceHash ), "No reference with expected hash" );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
index 6225a85..c593e82 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
@@ -3,11 +3,11 @@
namespace Wikibase\Test;
use Wikibase\ChangeOp\ChangeOpSiteLink;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\SimpleSiteLink;
-use Wikibase\Item;
use InvalidArgumentException;
+use Wikibase\DataModel\SiteLink;
/**
* @covers Wikibase\ChangeOp\ChangeOpSiteLink
@@ -47,9 +47,9 @@
}
public function changeOpSiteLinkProvider() {
- $deSiteLink = new SimpleSiteLink( 'dewiki', 'Berlin' );
- $enSiteLink = new SimpleSiteLink( 'enwiki', 'Berlin', array(
new ItemId( 'Q149' ) ) );
- $plSiteLink = new SimpleSiteLink( 'plwiki', 'Berlin', array(
new ItemId( 'Q42' ) ) );
+ $deSiteLink = new SiteLink( 'dewiki', 'Berlin' );
+ $enSiteLink = new SiteLink( 'enwiki', 'Berlin', array( new
ItemId( 'Q149' ) ) );
+ $plSiteLink = new SiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q42' ) ) );
$existingSiteLinks = array(
$deSiteLink,
@@ -84,7 +84,7 @@
new ChangeOpSiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q42' ), new ItemId( 'Q149' ) ) ),
array(
$deSiteLink,
- new SimpleSiteLink( 'plwiki', 'Berlin', array(
new ItemId( 'Q42' ), new ItemId( 'Q149' ) ) )
+ new SiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q42' ), new ItemId( 'Q149' ) ) )
)
);
@@ -94,7 +94,7 @@
new ChangeOpSiteLink( 'plwiki', 'Test' ),
array(
$deSiteLink,
- new SimpleSiteLink( 'plwiki', 'Test', array(
new ItemId( 'Q42' ) ) )
+ new SiteLink( 'plwiki', 'Test', array( new
ItemId( 'Q42' ) ) )
)
);
@@ -104,7 +104,7 @@
new ChangeOpSiteLink( 'plwiki', null, array( new
ItemId( 'Q149' ) ) ),
array(
$deSiteLink,
- new SimpleSiteLink( 'plwiki', 'Berlin', array(
new ItemId( 'Q149' ) ) )
+ new SiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q149' ) ) )
)
);
@@ -114,7 +114,7 @@
new ChangeOpSiteLink( 'plwiki', null, array( new
ItemId( 'q42' ), new ItemId( 'Q149' ), new ItemId( 'Q42' ) ) ),
array(
$deSiteLink,
- new SimpleSiteLink( 'plwiki', 'Berlin', array(
new ItemId( 'Q42' ), new ItemId( 'Q149' ) ) )
+ new SiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q42' ), new ItemId( 'Q149' ) ) )
)
);
@@ -126,7 +126,7 @@
*
* @param Item $entity
* @param ChangeOpSiteLink $changeOpSiteLink
- * @param SimpleSiteLink[] $expectedSiteLinks
+ * @param SiteLink[] $expectedSiteLinks
*/
public function testApply( Item $entity, ChangeOpSiteLink
$changeOpSiteLink, array $expectedSiteLinks ) {
$changeOpSiteLink->apply( $entity );
@@ -138,8 +138,8 @@
}
public function invalidChangeOpSiteLinkProvider() {
- $deSiteLink = new SimpleSiteLink( 'dewiki', 'Berlin' );
- $plSiteLink = new SimpleSiteLink( 'plwiki', 'Berlin', array(
new ItemId( 'Q42' ) ) );
+ $deSiteLink = new SiteLink( 'dewiki', 'Berlin' );
+ $plSiteLink = new SiteLink( 'plwiki', 'Berlin', array( new
ItemId( 'Q42' ) ) );
$existingSiteLinks = array(
$deSiteLink,
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
index e71c3c9..204b59d 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
@@ -2,11 +2,13 @@
namespace Wikibase\Test;
-use Wikibase\Claims;
+use DataValues\StringValue;
use Wikibase\ChangeOp\ChangeOpStatementRank;
-use Wikibase\Entity;
+use Wikibase\DataModel\Claim\Claims;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\ItemContent;
-use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Lib\ClaimGuidGenerator;
use InvalidArgumentException;
/**
@@ -25,7 +27,7 @@
public function invalidArgumentProvider() {
$item = ItemContent::newFromArray( array( 'entity' => 'q42' )
)->getEntity();
- $guidGenerator = new \Wikibase\Lib\ClaimGuidGenerator(
$item->getId() );
+ $guidGenerator = new ClaimGuidGenerator( $item->getId() );
$validClaimGuid = $guidGenerator->newGuid();
$validRank = 1;
@@ -42,12 +44,11 @@
* @expectedException InvalidArgumentException
*/
public function testInvalidConstruct( $claimGuid, $rank ) {
- $ChangeOpStatementRank = new ChangeOpStatementRank( $claimGuid,
$rank );
+ new ChangeOpStatementRank( $claimGuid, $rank );
}
public function changeOpProvider() {
- $idFormatter =
WikibaseRepo::getDefaultInstance()->getIdFormatter();
- $snak = new \Wikibase\PropertyValueSnak( 2754236, new
\DataValues\StringValue( 'test' ) );
+ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test'
) );
$args = array();
$item = $this->provideNewItemWithClaim( 'q123', $snak );
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index 3b56ad8..49489fb 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -3,9 +3,9 @@
namespace Wikibase\Test;
use Wikibase\ChangeOp\ChangeOpsMerge;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Internal\ObjectComparer;
-use Wikibase\Item;
use Wikibase\ItemContent;
/**
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
index 64f4aa9..5401713 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
@@ -125,7 +125,7 @@
}
/**
- * @expectedException \Wikibase\ChangeOp\ChangeOpException
+ * @expectedException \Wikibase\ChangeOp\ChangeOpException
*/
public function testInvalidApply() {
$item = ItemContent::newEmpty();
--
To view, visit https://gerrit.wikimedia.org/r/107576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I568e71ba24299a3768a4325a54e17de48d300ecc
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
