Revert variable name changes and merge conflict fragments

Author: thiemowmde

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

@@ -4,16 +4,14 @@
 
 * 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)
 
-
-## Version 2.5.0 (dev)
-
 * Empty strings are now detected as invalid in the `SiteLink` constructor
 * The `SnakList` constructor now throws an `InvalidArgumentException` when getting a non-iterable input
 * The `AliasGroup::equals` and `Term::equals` methods no longer incorrectly return true for fallback objects

WikibaseDataModel.php

@@ -20,4 +20,5 @@
 	} );
 }
 
-class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\DataModel\Claim\Claim' );
+// Aliases introduced in 3.0.0
+class_alias( 'Wikibase\DataModel\Statement\Statement', 'Wikibase\DataModel\Claim\Claim' );