Jeroen De Dauw has submitted this change and it was merged.
Change subject: Put changeops in their own namespace
......................................................................
Put changeops in their own namespace
Change-Id: I4a8bdf1e24868d9e90544a43670ad2100f36961e
---
M repo/Wikibase.classes.php
M repo/includes/api/CreateClaim.php
M repo/includes/api/EditEntity.php
M repo/includes/api/MergeItems.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetSiteLink.php
M repo/includes/api/SetStatementRank.php
M repo/includes/changeop/ChangeOp.php
M repo/includes/changeop/ChangeOpAliases.php
M repo/includes/changeop/ChangeOpBase.php
M repo/includes/changeop/ChangeOpClaim.php
M repo/includes/changeop/ChangeOpDescription.php
M repo/includes/changeop/ChangeOpException.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/includes/specials/SpecialSetAliases.php
M repo/includes/specials/SpecialSetDescription.php
M repo/includes/specials/SpecialSetEntity.php
M repo/includes/specials/SpecialSetLabel.php
M repo/includes/specials/SpecialSetSiteLink.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
45 files changed, 133 insertions(+), 98 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 96dcdc6..4f6579b 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -50,20 +50,20 @@
'Wikibase\Repo\WikibaseRepo' => 'includes/WikibaseRepo.php',
// includes/changeop
- 'Wikibase\ChangeOps' => 'includes/changeop/ChangeOps.php',
- 'Wikibase\ChangeOpsMerge' =>
'includes/changeop/ChangeOpsMerge.php',
- 'Wikibase\ChangeOp' => 'includes/changeop/ChangeOp.php',
- 'Wikibase\ChangeOpBase' => 'includes/changeop/ChangeOpBase.php',
- 'Wikibase\ChangeOpLabel' =>
'includes/changeop/ChangeOpLabel.php',
- 'Wikibase\ChangeOpDescription' =>
'includes/changeop/ChangeOpDescription.php',
- 'Wikibase\ChangeOpAliases' =>
'includes/changeop/ChangeOpAliases.php',
- 'Wikibase\ChangeOpSiteLink' =>
'includes/changeop/ChangeOpSiteLink.php',
- 'Wikibase\ChangeOpMainSnak' =>
'includes/changeop/ChangeOpMainSnak.php',
- 'Wikibase\ChangeOpClaim' =>
'includes/changeop/ChangeOpClaim.php',
- 'Wikibase\ChangeOpQualifier' =>
'includes/changeop/ChangeOpQualifier.php',
- 'Wikibase\ChangeOpReference' =>
'includes/changeop/ChangeOpReference.php',
- 'Wikibase\ChangeOpStatementRank' =>
'includes/changeop/ChangeOpStatementRank.php',
- 'Wikibase\ChangeOpException' =>
'includes/changeop/ChangeOpException.php',
+ 'Wikibase\ChangeOp\ChangeOps' =>
'includes/changeop/ChangeOps.php',
+ 'Wikibase\ChangeOp\ChangeOpsMerge' =>
'includes/changeop/ChangeOpsMerge.php',
+ 'Wikibase\ChangeOp\ChangeOp' =>
'includes/changeop/ChangeOp.php',
+ 'Wikibase\ChangeOp\ChangeOpBase' =>
'includes/changeop/ChangeOpBase.php',
+ 'Wikibase\ChangeOp\ChangeOpLabel' =>
'includes/changeop/ChangeOpLabel.php',
+ 'Wikibase\ChangeOp\ChangeOpDescription' =>
'includes/changeop/ChangeOpDescription.php',
+ 'Wikibase\ChangeOp\ChangeOpAliases' =>
'includes/changeop/ChangeOpAliases.php',
+ 'Wikibase\ChangeOp\ChangeOpSiteLink' =>
'includes/changeop/ChangeOpSiteLink.php',
+ 'Wikibase\ChangeOp\ChangeOpMainSnak' =>
'includes/changeop/ChangeOpMainSnak.php',
+ 'Wikibase\ChangeOp\ChangeOpClaim' =>
'includes/changeop/ChangeOpClaim.php',
+ 'Wikibase\ChangeOp\ChangeOpQualifier' =>
'includes/changeop/ChangeOpQualifier.php',
+ 'Wikibase\ChangeOp\ChangeOpReference' =>
'includes/changeop/ChangeOpReference.php',
+ 'Wikibase\ChangeOp\ChangeOpStatementRank' =>
'includes/changeop/ChangeOpStatementRank.php',
+ 'Wikibase\ChangeOp\ChangeOpException' =>
'includes/changeop/ChangeOpException.php',
// includes/actions
'Wikibase\HistoryEntityAction' =>
'includes/actions/HistoryEntityAction.php',
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index ee9ecfa..838c14c 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -6,8 +6,8 @@
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Claims;
-use Wikibase\ChangeOpMainSnak;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpMainSnak;
+use Wikibase\ChangeOp\ChangeOpException;
/**
* API module for creating claims.
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 039052f..98d155d 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -4,18 +4,18 @@
use DataValues\IllegalValueException;
use MWException;
-use Wikibase\ChangeOp;
-use Wikibase\ChangeOpMainSnak;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOp\ChangeOp;
+use Wikibase\ChangeOp\ChangeOpMainSnak;
+use Wikibase\ChangeOp\ChangeOpClaim;
use Wikibase\Claim;
use Wikibase\EntityContentFactory;
use InvalidArgumentException;
-use Wikibase\ChangeOps;
-use Wikibase\ChangeOpLabel;
-use Wikibase\ChangeOpDescription;
-use Wikibase\ChangeOpAliases;
-use Wikibase\ChangeOpSiteLink;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOps;
+use Wikibase\ChangeOp\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpDescription;
+use Wikibase\ChangeOp\ChangeOpAliases;
+use Wikibase\ChangeOp\ChangeOpSiteLink;
+use Wikibase\ChangeOp\ChangeOpException;
use ApiBase, User, Status, SiteList;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\EntityContent;
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index 8bf4c52..ee66057 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -4,8 +4,8 @@
use ApiBase, User, Status, SiteList;
use ValueParsers\ParseException;
-use Wikibase\ChangeOpException;
-use Wikibase\ChangeOpsMerge;
+use Wikibase\ChangeOp\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpsMerge;
use Wikibase\Claim;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityContentFactory;
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 28d6973..617337a 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -8,9 +8,9 @@
use Wikibase\Entity;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOps;
-use Wikibase\ChangeOpMainSnak;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOps;
+use Wikibase\ChangeOp\ChangeOpMainSnak;
+use Wikibase\ChangeOp\ChangeOpException;
/**
* API module for removing claims.
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index f5ed9d3..f35f48c 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -5,9 +5,9 @@
use ApiBase;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOpQualifier;
-use Wikibase\ChangeOps;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpQualifier;
+use Wikibase\ChangeOp\ChangeOps;
+use Wikibase\ChangeOp\ChangeOpException;
/**
* API module for removing qualifiers from a claim.
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index e2210eb..281e168 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -5,9 +5,9 @@
use ApiBase;
use Wikibase\Statement;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOpReference;
-use Wikibase\ChangeOps;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpReference;
+use Wikibase\ChangeOp\ChangeOps;
+use Wikibase\ChangeOp\ChangeOpException;
/**
* API module for removing one or more references of the same statement.
diff --git a/repo/includes/api/SetAliases.php b/repo/includes/api/SetAliases.php
index 9e86a89..9cb35fd 100644
--- a/repo/includes/api/SetAliases.php
+++ b/repo/includes/api/SetAliases.php
@@ -2,11 +2,11 @@
namespace Wikibase\Api;
-use Wikibase\ChangeOps;
+use Wikibase\ChangeOp\ChangeOps;
use ApiBase, User, Language;
use Wikibase\EntityContent;
use Wikibase\Utils;
-use Wikibase\ChangeOpAliases;
+use Wikibase\ChangeOp\ChangeOpAliases;
/**
* API module to set the aliases for a Wikibase entity.
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index 3fa43b3..9efb4e9 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -3,8 +3,8 @@
namespace Wikibase\Api;
use ApiBase;
-use Wikibase\ChangeOpMainSnak;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpMainSnak;
+use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/api/SetDescription.php
b/repo/includes/api/SetDescription.php
index 4c63be9..daea4d1 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -5,7 +5,7 @@
use ApiBase;
use Wikibase\EntityContent;
use Wikibase\Utils;
-use Wikibase\ChangeOpDescription;
+use Wikibase\ChangeOp\ChangeOpDescription;
/**
* API module for the language attributes for a Wikibase entity.
diff --git a/repo/includes/api/SetLabel.php b/repo/includes/api/SetLabel.php
index 354f1b5..5816160 100644
--- a/repo/includes/api/SetLabel.php
+++ b/repo/includes/api/SetLabel.php
@@ -5,7 +5,7 @@
use ApiBase;
use Wikibase\EntityContent;
use Wikibase\Utils;
-use Wikibase\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpLabel;
/**
* API module to set the label for a Wikibase entity.
diff --git a/repo/includes/api/SetQualifier.php
b/repo/includes/api/SetQualifier.php
index bf0b8e1..f534aa0 100644
--- a/repo/includes/api/SetQualifier.php
+++ b/repo/includes/api/SetQualifier.php
@@ -5,8 +5,8 @@
use ApiBase;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOpQualifier;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpQualifier;
+use Wikibase\ChangeOp\ChangeOpException;
/**
* API module for creating a qualifier or setting the value of an existing one.
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index 0d59104..ae0aaf5 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -4,8 +4,8 @@
use ApiBase;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOpReference;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpReference;
+use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\SnakList;
use Wikibase\Statement;
use Wikibase\Reference;
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index 79a23a2..b2e27c7 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -2,7 +2,7 @@
namespace Wikibase\Api;
-use Wikibase\ChangeOpSiteLink;
+use Wikibase\ChangeOp\ChangeOpSiteLink;
use ApiBase, User;
use Wikibase\EntityContent;
use Wikibase\ItemContent;
diff --git a/repo/includes/api/SetStatementRank.php
b/repo/includes/api/SetStatementRank.php
index 7d592a1..0b0d765 100644
--- a/repo/includes/api/SetStatementRank.php
+++ b/repo/includes/api/SetStatementRank.php
@@ -5,8 +5,8 @@
use ApiBase;
use Wikibase\Claim;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\ChangeOpStatementRank;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpStatementRank;
+use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\Statement;
use Wikibase\Lib\Serializers\ClaimSerializer;
diff --git a/repo/includes/changeop/ChangeOp.php
b/repo/includes/changeop/ChangeOp.php
index 713cb5e..b3b6a92 100644
--- a/repo/includes/changeop/ChangeOp.php
+++ b/repo/includes/changeop/ChangeOp.php
@@ -1,6 +1,9 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
+
+use Wikibase\Entity;
+use Wikibase\Summary;
/**
* @since 0.5
diff --git a/repo/includes/changeop/ChangeOpAliases.php
b/repo/includes/changeop/ChangeOpAliases.php
index 5b260bc..3c905d3 100644
--- a/repo/includes/changeop/ChangeOpAliases.php
+++ b/repo/includes/changeop/ChangeOpAliases.php
@@ -1,8 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Entity;
+use Wikibase\Summary;
/**
* Class for aliases change operation
diff --git a/repo/includes/changeop/ChangeOpBase.php
b/repo/includes/changeop/ChangeOpBase.php
index f7f009d..3d800b7 100644
--- a/repo/includes/changeop/ChangeOpBase.php
+++ b/repo/includes/changeop/ChangeOpBase.php
@@ -1,8 +1,9 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Summary;
/**
* Base class for change operations.
diff --git a/repo/includes/changeop/ChangeOpClaim.php
b/repo/includes/changeop/ChangeOpClaim.php
index 36c9698..33367e2 100644
--- a/repo/includes/changeop/ChangeOpClaim.php
+++ b/repo/includes/changeop/ChangeOpClaim.php
@@ -1,10 +1,13 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Claim;
+use Wikibase\Entity;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Lib\ClaimGuidValidator;
+use Wikibase\Summary;
/**
* Class for claim modification operations
diff --git a/repo/includes/changeop/ChangeOpDescription.php
b/repo/includes/changeop/ChangeOpDescription.php
index 6d609e6..37934c9 100644
--- a/repo/includes/changeop/ChangeOpDescription.php
+++ b/repo/includes/changeop/ChangeOpDescription.php
@@ -1,8 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Entity;
+use Wikibase\Summary;
/**
* Class for description change operation
diff --git a/repo/includes/changeop/ChangeOpException.php
b/repo/includes/changeop/ChangeOpException.php
index d0e547b..26bb689 100644
--- a/repo/includes/changeop/ChangeOpException.php
+++ b/repo/includes/changeop/ChangeOpException.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
/**
* Exception thrown during an invalid change operation.
diff --git a/repo/includes/changeop/ChangeOpLabel.php
b/repo/includes/changeop/ChangeOpLabel.php
index 4864575..37ada71 100644
--- a/repo/includes/changeop/ChangeOpLabel.php
+++ b/repo/includes/changeop/ChangeOpLabel.php
@@ -1,8 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Entity;
+use Wikibase\Summary;
/**
* Class for label change operation
diff --git a/repo/includes/changeop/ChangeOpMainSnak.php
b/repo/includes/changeop/ChangeOpMainSnak.php
index 6abd27b..32203e1 100644
--- a/repo/includes/changeop/ChangeOpMainSnak.php
+++ b/repo/includes/changeop/ChangeOpMainSnak.php
@@ -1,11 +1,15 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
use Wikibase\Lib\ClaimGuidGenerator;
-use Wikibase\Snak;
use Wikibase\Lib\EntityIdFormatter;
+use Wikibase\PropertyValueSnak;
+use Wikibase\Claims;
+use Wikibase\Entity;
+use Wikibase\Snak;
+use Wikibase\Summary;
/**
* Class for mainsnak change operation
@@ -44,8 +48,8 @@
*
* @param string $claimGuid
* @param Snak|null $snak
- * @param Lib\EntityIdFormatter $idFormatter
- * @param Lib\ClaimGuidGenerator $guidGenerator
+ * @param EntityIdFormatter $idFormatter
+ * @param ClaimGuidGenerator $guidGenerator
* @throws \InvalidArgumentException
*/
public function __construct( $claimGuid, $snak, EntityIdFormatter
$idFormatter, ClaimGuidGenerator $guidGenerator ) {
diff --git a/repo/includes/changeop/ChangeOpQualifier.php
b/repo/includes/changeop/ChangeOpQualifier.php
index 7856fd1..0bb5134 100644
--- a/repo/includes/changeop/ChangeOpQualifier.php
+++ b/repo/includes/changeop/ChangeOpQualifier.php
@@ -1,11 +1,15 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Claims;
+use Wikibase\Entity;
+use Wikibase\PropertyValueSnak;
use Wikibase\Snak;
use Wikibase\Snaks;
use Wikibase\Lib\EntityIdFormatter;
+use Wikibase\Summary;
/**
* Class for qualifier change operation
diff --git a/repo/includes/changeop/ChangeOpReference.php
b/repo/includes/changeop/ChangeOpReference.php
index c48eeb8..05f9510 100644
--- a/repo/includes/changeop/ChangeOpReference.php
+++ b/repo/includes/changeop/ChangeOpReference.php
@@ -1,13 +1,17 @@
<?php
-namespace Wikibase;
+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\PropertyValueSnak;
use Wikibase\Lib\EntityIdFormatter;
+use Wikibase\Summary;
/**
* Class for reference change operation
@@ -54,7 +58,7 @@
* @param string $claimGuid
* @param Reference|null $reference
* @param string $referenceHash
- * @param Lib\EntityIdFormatter $idFormatter
+ * @param EntityIdFormatter $idFormatter
*
* @throws \InvalidArgumentException
*/
diff --git a/repo/includes/changeop/ChangeOpSiteLink.php
b/repo/includes/changeop/ChangeOpSiteLink.php
index df16f63..255981e 100644
--- a/repo/includes/changeop/ChangeOpSiteLink.php
+++ b/repo/includes/changeop/ChangeOpSiteLink.php
@@ -1,10 +1,13 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use Site;
use InvalidArgumentException;
use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\Entity;
+use Wikibase\Item;
+use Wikibase\Summary;
/**
* Class for sitelink change operation
diff --git a/repo/includes/changeop/ChangeOpStatementRank.php
b/repo/includes/changeop/ChangeOpStatementRank.php
index a03bb68..2a120a7 100644
--- a/repo/includes/changeop/ChangeOpStatementRank.php
+++ b/repo/includes/changeop/ChangeOpStatementRank.php
@@ -1,12 +1,16 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Claims;
+use Wikibase\Entity;
+use Wikibase\PropertyValueSnak;
use Wikibase\Snak;
use Wikibase\Statement;
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\Serializers\ClaimSerializer;
+use Wikibase\Summary;
/**
* Class for statement rank change operation
@@ -45,9 +49,9 @@
*
* @param string $claimGuid
* @param integer $rank
- * @param Lib\EntityIdFormatter $idFormatter
+ * @param EntityIdFormatter $idFormatter
*
- * @throws \InvalidArgumentException
+ * @throws InvalidArgumentException
*/
public function __construct( $claimGuid, $rank, EntityIdFormatter
$idFormatter ) {
if ( !is_string( $claimGuid ) ) {
diff --git a/repo/includes/changeop/ChangeOps.php
b/repo/includes/changeop/ChangeOps.php
index f932763..49cf1a0 100644
--- a/repo/includes/changeop/ChangeOps.php
+++ b/repo/includes/changeop/ChangeOps.php
@@ -1,8 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Entity;
+use Wikibase\Summary;
/**
* Class for holding a batch of change operations
diff --git a/repo/includes/changeop/ChangeOpsMerge.php
b/repo/includes/changeop/ChangeOpsMerge.php
index e73bba0..6ec4063 100644
--- a/repo/includes/changeop/ChangeOpsMerge.php
+++ b/repo/includes/changeop/ChangeOpsMerge.php
@@ -1,7 +1,8 @@
<?php
-namespace Wikibase;
+namespace Wikibase\ChangeOp;
+use Wikibase\ItemContent;
use Wikibase\Lib\ClaimGuidGenerator;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/specials/SpecialSetAliases.php
b/repo/includes/specials/SpecialSetAliases.php
index 01feda3..c45d2e1 100644
--- a/repo/includes/specials/SpecialSetAliases.php
+++ b/repo/includes/specials/SpecialSetAliases.php
@@ -2,7 +2,7 @@
namespace Wikibase\Repo\Specials;
-use Wikibase\ChangeOpAliases;
+use Wikibase\ChangeOp\ChangeOpAliases;
use Wikibase\Summary;
/**
diff --git a/repo/includes/specials/SpecialSetDescription.php
b/repo/includes/specials/SpecialSetDescription.php
index 68fc5b0..cbdaf05 100644
--- a/repo/includes/specials/SpecialSetDescription.php
+++ b/repo/includes/specials/SpecialSetDescription.php
@@ -2,7 +2,7 @@
namespace Wikibase\Repo\Specials;
-use Wikibase\ChangeOpDescription;
+use Wikibase\ChangeOp\ChangeOpDescription;
use Wikibase\EntityContent;
use Wikibase\Summary;
diff --git a/repo/includes/specials/SpecialSetEntity.php
b/repo/includes/specials/SpecialSetEntity.php
index 020fc8e..4ac167a 100644
--- a/repo/includes/specials/SpecialSetEntity.php
+++ b/repo/includes/specials/SpecialSetEntity.php
@@ -5,7 +5,7 @@
use Html;
use Language;
use Wikibase\Summary;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\Utils;
/**
diff --git a/repo/includes/specials/SpecialSetLabel.php
b/repo/includes/specials/SpecialSetLabel.php
index 1843e76..758dae7 100644
--- a/repo/includes/specials/SpecialSetLabel.php
+++ b/repo/includes/specials/SpecialSetLabel.php
@@ -2,7 +2,7 @@
namespace Wikibase\Repo\Specials;
-use Wikibase\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpLabel;
use Wikibase\EntityContent;
use Wikibase\Summary;
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 952d809..0a09bb5 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -6,8 +6,8 @@
use Sites;
use Status;
use Wikibase\EntityContent;
-use Wikibase\ChangeOpSiteLink;
-use Wikibase\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOpSiteLink;
+use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\Summary;
/**
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
index dd55ee5..9839aac 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpAliasesTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Wikibase\ChangeOpAliases;
+use Wikibase\ChangeOp\ChangeOpAliases;
use Wikibase\Entity;
use Wikibase\ItemContent;
use InvalidArgumentException;
@@ -70,7 +70,7 @@
}
/**
- * @expectedException \Wikibase\ChangeOpException
+ * @expectedException \Wikibase\ChangeOp\ChangeOpException
*/
public function testApplyWithInvalidAction() {
$item = ItemContent::newEmpty();
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
index 4e6627d..2572061 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpClaimTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Wikibase\ChangeOpClaim;
+use Wikibase\ChangeOp\ChangeOpClaim;
use Wikibase\Claim;
use Wikibase\Claims;
use Wikibase\DataModel\Entity\ItemId;
@@ -96,7 +96,7 @@
*/
public function testApply( $entity, $claim, $expected ) {
if( $expected === false ){
- $this->setExpectedException(
'\Wikibase\ChangeOpException' );
+ $this->setExpectedException(
'\Wikibase\ChangeOp\ChangeOpException' );
}
$changeOpClaim = new ChangeOpClaim( $claim, new
ClaimGuidGenerator( $entity->getId() ) );
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
index db62301..4b2f273 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpDescriptionTest.php
@@ -2,8 +2,8 @@
namespace Wikibase\Test;
-use Wikibase\ChangeOp;
-use Wikibase\ChangeOpDescription;
+use Wikibase\ChangeOp\ChangeOp;
+use Wikibase\ChangeOp\ChangeOpDescription;
use Wikibase\ItemContent;
use InvalidArgumentException;
use Wikibase\Summary;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
index 4a150e2..1db59c9 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpLabelTest.php
@@ -2,9 +2,9 @@
namespace Wikibase\Test;
-use Wikibase\ChangeOp;
+use Wikibase\ChangeOp\ChangeOp;
use Wikibase\Summary;
-use Wikibase\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpLabel;
use Wikibase\ItemContent;
use InvalidArgumentException;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
index 26cfeb4..963d1bc 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpMainSnakTest.php
@@ -3,10 +3,10 @@
namespace Wikibase\Test;
use DataValues\DataValue;
-use Wikibase\ChangeOp;
+use Wikibase\ChangeOp\ChangeOp;
use Wikibase\Claim;
use Wikibase\Claims;
-use Wikibase\ChangeOpMainSnak;
+use Wikibase\ChangeOp\ChangeOpMainSnak;
use Wikibase\Entity;
use Wikibase\ItemContent;
use Wikibase\Repo\WikibaseRepo;
@@ -120,7 +120,7 @@
/**
* @dataProvider provideChangeOps
- * @expectedException \Wikibase\ChangeOpException
+ * @expectedException \Wikibase\ChangeOp\ChangeOpException
*/
public function testInvalidApply( ChangeOp $changeOp ) {
$wrongItem = ItemContent::newEmpty();
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
index fce3cec..55290df 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpQualifierTest.php
@@ -4,7 +4,7 @@
use Wikibase\Claim;
use Wikibase\Claims;
-use Wikibase\ChangeOpQualifier;
+use Wikibase\ChangeOp\ChangeOpQualifier;
use Wikibase\Entity;
use Wikibase\ItemContent;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpReferenceTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpReferenceTest.php
index 165ca09..f572d9a 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpReferenceTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpReferenceTest.php
@@ -3,7 +3,7 @@
namespace Wikibase\Test;
use Wikibase\Claims;
-use Wikibase\ChangeOpReference;
+use Wikibase\ChangeOp\ChangeOpReference;
use Wikibase\Entity;
use Wikibase\ItemContent;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpSiteLinkTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpSiteLinkTest.php
index db158c7..99ad28c 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpSiteLinkTest.php
@@ -3,7 +3,7 @@
namespace Wikibase\Test;
use Site;
-use Wikibase\ChangeOpSiteLink;
+use Wikibase\ChangeOp\ChangeOpSiteLink;
use Wikibase\DataModel\SimpleSiteLink;
use Wikibase\Item;
use InvalidArgumentException;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpStatementRankTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpStatementRankTest.php
index 9a86091..0647a94 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpStatementRankTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpStatementRankTest.php
@@ -4,7 +4,7 @@
use Wikibase\Claim;
use Wikibase\Claims;
-use Wikibase\ChangeOpStatementRank;
+use Wikibase\ChangeOp\ChangeOpStatementRank;
use Wikibase\Entity;
use Wikibase\ItemContent;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpsMergeTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpsMergeTest.php
index cb583be..7ba7af6 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpsMergeTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpsMergeTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use Wikibase\ChangeOpsMerge;
+use Wikibase\ChangeOp\ChangeOpsMerge;
use Wikibase\Claims;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SimpleSiteLink;
@@ -23,7 +23,7 @@
$from = $this->getItemContent( 'Q111' );
$to = $this->getItemContent( 'Q222' );
$changeOps = new ChangeOpsMerge( $from, $to );
- $this->assertInstanceOf( '\Wikibase\ChangeOpsMerge', $changeOps
);
+ $this->assertInstanceOf( '\Wikibase\ChangeOp\ChangeOpsMerge',
$changeOps );
}
public function getItemContent( $id, $data = array() ){
diff --git a/repo/tests/phpunit/includes/changeop/ChangeOpsTest.php
b/repo/tests/phpunit/includes/changeop/ChangeOpsTest.php
index db8e59a..b487aae 100644
--- a/repo/tests/phpunit/includes/changeop/ChangeOpsTest.php
+++ b/repo/tests/phpunit/includes/changeop/ChangeOpsTest.php
@@ -3,11 +3,11 @@
namespace Wikibase\Test;
use InvalidArgumentException;
-use Wikibase\ChangeOp;
-use Wikibase\ChangeOpLabel;
-use Wikibase\ChangeOpDescription;
-use Wikibase\ChangeOpAliases;
-use Wikibase\ChangeOps;
+use Wikibase\ChangeOp\ChangeOp;
+use Wikibase\ChangeOp\ChangeOpLabel;
+use Wikibase\ChangeOp\ChangeOpDescription;
+use Wikibase\ChangeOp\ChangeOpAliases;
+use Wikibase\ChangeOp\ChangeOps;
use Wikibase\ItemContent;
/**
@@ -125,7 +125,7 @@
}
/**
- * @expectedException \Wikibase\ChangeOpException
+ * @expectedException \Wikibase\ChangeOp\ChangeOpException
*/
public function testInvalidApply() {
$item = ItemContent::newEmpty();
--
To view, visit https://gerrit.wikimedia.org/r/87533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a8bdf1e24868d9e90544a43670ad2100f36961e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[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
