Merge pull request #317 from wmde/removeClaim

Remove claim

Author: JeroenDeDauw

Aliases.php

@@ -0,0 +1,16 @@
+<?php
+
+// This is a IDE helper to understand class aliasing.
+// It should not be included anywhere.
+// Actual aliasing happens in the entry point using class_alias.
+
+namespace { throw new Exception( 'This code is not meant to be executed' ); }
+
+namespace Wikibase\DataModel\Claim {
+
+	/**
+	 * @deprecated since 3.0.0, use the base class instead.
+	 */
+	class Claim extends \Wikibase\DataModel\Statement\Statement {}
+
+}

RELEASE-NOTES.md

@@ -2,10 +2,13 @@
 
 ## Version 3.0.0 (dev)
 
-* `Statement` no longer takes a `Claim` in its constructor
-* `Statement::setClaim` and `Statement::getClaim` have been removed
-* Removed `ClaimList`
-* Removed `ClaimListAccess`
+* The concept of `Claim` is no longer modelled
+	* The `Claim` class itself has been removed, though `Claim` is now a temporary alias for `Statement`
+	* `Claim::RANK_TRUTH` have been removed
+	* `Statement` no longer takes a `Claim` in its constructor
+	* `Statement::setClaim` and `Statement::getClaim` have been removed
+	* Removed `ClaimList`
+	* Removed `ClaimListAccess`
 
 ## Version 2.6.0 (dev)
 

WikibaseDataModel.php

@@ -19,3 +19,6 @@
 		require_once __DIR__ . '/WikibaseDataModel.mw.php';
 	} );
 }
+
+// Aliases introduced in 3.0.0
+class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\DataModel\Claim\Claim' );

src/Claim/Claim.php

@@ -15,7 +15,7 @@
 /**
  * A claim (identified using it's GUID) can only be added once.
  *
- * @deprecated since 1.0
+ * @deprecated since 1.0, use StatementList and associated classes instead.
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
@@ -63,8 +63,6 @@ private function getGuidKey( $guid ) {
 	}
 
 	/**
-	 * @param Claim $claim
-	 *
 	 * @param Claim $claim
 	 *
 	 * @throws InvalidArgumentException
@@ -437,7 +435,7 @@ public function getByRanks( array $ranks ) {
 	 * @return Claims
 	 */
 	public function getBestClaims() {
-		$rank = Claim::RANK_TRUTH;
+		$rank = Statement::RANK_PREFERRED;
 
 		do {
 			$claims = $this->getByRank( $rank );