Move Statement from Claim to Statement sub NS

Author: JeroenDeDauw

Aliases.php

@@ -88,7 +88,7 @@ class Claims extends \Wikibase\DataModel\Claim\Claims {}
 	/**
 	 * @deprecated since 0.6, use the base class instead.
 	 */
-	class Statement extends \Wikibase\DataModel\Claim\Statement {}
+	class Statement extends DataModel\Statement\Statement {}
 	/**
 	 * @deprecated since 0.6, use the base class instead.
 	 */
@@ -165,3 +165,12 @@ class ItemDiff extends \Wikibase\DataModel\Entity\Diff\ItemDiff {}
 	class EntityDiff extends \Wikibase\DataModel\Entity\Diff\EntityDiff {}
 
 }
+
+namespace Wikibase\DataModel\Claim {
+
+	/**
+	 * @deprecated since 1.0, use the base class instead.
+	 */
+	class Statement extends \Wikibase\DataModel\Statement\Statement {}
+
+}

WikibaseDataModel.php

@@ -38,7 +38,7 @@ class_alias( 'Wikibase\DataModel\ByPropertyIdArray', 'Wikibase\ByPropertyIdArray
 class_alias( 'Wikibase\DataModel\Claim\Claim', 'Wikibase\Claim' );
 class_alias( 'Wikibase\DataModel\Claim\ClaimListAccess', 'Wikibase\ClaimListAccess' );
 class_alias( 'Wikibase\DataModel\Claim\Claims', 'Wikibase\Claims' );
-class_alias( 'Wikibase\DataModel\Claim\Statement', 'Wikibase\Statement' );
+class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\Statement' );
 class_alias( 'Wikibase\DataModel\Entity\Entity', 'Wikibase\Entity' );
 class_alias( 'Wikibase\DataModel\Entity\Item', 'Wikibase\Item' );
 class_alias( 'Wikibase\DataModel\Entity\Property', 'Wikibase\Property' );
@@ -60,3 +60,4 @@ class_alias( 'Wikibase\DataModel\LegacyIdInterpreter', 'Wikibase\DataModel\Inter
 // Aliases introduced in 1.0
 class_alias( 'Wikibase\DataModel\Entity\Diff\EntityDiff', 'Wikibase\DataModel\Entity\EntityDiff' );
 class_alias( 'Wikibase\DataModel\Entity\Diff\ItemDiff', 'Wikibase\DataModel\Entity\ItemDiff' );
+class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\DataModel\Claim\Statement' );

src/Claim/Claim.php

@@ -9,6 +9,7 @@
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Snak\SnakList;
 use Wikibase\DataModel\Snak\Snaks;
+use Wikibase\DataModel\Statement\Statement;
 
 /**
  * Class that represents a single Wikibase claim.

src/Entity/Item.php

@@ -10,7 +10,7 @@
 use OutOfBoundsException;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Entity\Diff\EntityDiff;
 use Wikibase\DataModel\Entity\Diff\ItemDiff;
 use Wikibase\DataModel\SiteLink;
@@ -341,7 +341,7 @@ public function addClaim( Claim $claim ) {
 	/**
 	 * @since 1.0
 	 *
-	 * @return Statement[]
+	 * @return \Wikibase\DataModel\Statement\Statement[]
 	 */
 	public function getStatements() {
 		return $this->statements;

src/Claim/Statement.php src/Statement/Statement.phpsrc/Claim/Statement.php renamed to src/Statement/Statement.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Wikibase\DataModel\Claim;
+namespace Wikibase\DataModel\Statement;
 
 use InvalidArgumentException;
+use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\ReferenceList;
 use Wikibase\DataModel\References;

src/Statement/StatementList.php

@@ -5,7 +5,7 @@
 use InvalidArgumentException;
 use Traversable;
 use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\ReferenceList;

tests/unit/ByPropertyIdArrayTest.php

@@ -8,7 +8,7 @@
 use Wikibase\Claims;
 use Wikibase\DataModel\ByPropertyIdArray;
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;

tests/unit/Claim/ClaimStandaloneTest.php

@@ -3,7 +3,7 @@
 namespace Wikibase\Test;
 
 use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;
 use Wikibase\DataModel\Snak\SnakList;

tests/unit/Claim/ClaimsTest.php

@@ -12,7 +12,7 @@
 use Wikibase\DataModel\ByPropertyIdArray;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\ReferenceList;

tests/unit/Entity/Diff/ItemDifferTest.php

@@ -6,7 +6,7 @@
 use Diff\DiffOp\DiffOpAdd;
 use Diff\DiffOp\DiffOpChange;
 use Diff\DiffOp\DiffOpRemove;
-use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\DataModel\Entity\Diff\ItemDiffer;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;