Merge 3.0.x-dev into master

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

@@ -1,5 +1,15 @@
 # Wikibase DataModel release notes
 
+## Version 3.0.0 (dev)
+
+* 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 (2015-03-08)
 
 * Added `Reference::isEmpty`

WikibaseDataModel.php

@@ -12,10 +12,13 @@
 	return 1;
 }
 
-define( 'WIKIBASE_DATAMODEL_VERSION', '2.7.0 alpha' );
+define( 'WIKIBASE_DATAMODEL_VERSION', '3.0.0 alpha' );
 
 if ( defined( 'MEDIAWIKI' ) ) {
 	call_user_func( function() {
 		require_once __DIR__ . '/WikibaseDataModel.mw.php';
 	} );
 }
+
+// Aliases introduced in 3.0.0
+class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\DataModel\Claim\Claim' );

composer.json

@@ -40,7 +40,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.7.x-dev"
+			"dev-master": "3.0.x-dev"
 		}
 	},
 	"scripts": {