Merge in ClearableEntity from 7.5.0

Author: jakobw

RELEASE-NOTES.md

@@ -13,12 +13,16 @@ This release removes integers as acceptable entity IDs.
   `hasElement`, `hasElementHash`, `hasValidType`, `preSetElement`, `removeByElementHash`,
   `removeElement`, and `setElement`.
 * Added periods to the list of disallowed characters in `RepositoryNameAssert`.
-* Added `EntityDocument::clear`
+* `EntityDocument` now extends `ClearableEntity`
 
 #### Other changes
 * Un-deprecated several sitelink related shortcuts from `Item`: `addSiteLink`, `getSiteLink`,
   `hasLinkToSite`, and `removeSiteLink`.
 
+## Version 7.5.0 (2018-05-02)
+
+* Introduce `ClearableEntity` interface.
+
 ## Version 7.4.1 (2018-05-02)
 
 * Removed `clear` from `EntityDocument`. This was a compatibility break of the interface.

src/Entity/ClearableEntity.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Wikibase\DataModel\Entity;
+
+/**
+ * Interface for Entity objects that can be cleared.
+ *
+ * @since 7.5
+ *
+ * @license GPL-2.0+
+ */
+interface ClearableEntity {
+
+	/**
+	 * Clears all fields of the entity that can be emptied. The entity's id stays the same.
+	 *
+	 * @since 7.5
+	 */
+	public function clear();
+
+}

src/Entity/EntityDocument.php

@@ -15,7 +15,7 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-interface EntityDocument extends Comparable {
+interface EntityDocument extends Comparable, ClearableEntity {
 
 	/**
 	 * Returns a type identifier for the entity, e.g. "item" or "property".
@@ -88,11 +88,4 @@ public function equals( $target );
 	 */
 	public function copy();
 
-	/**
-	 * Clears all fields of the entity that can be emptied. The entity's id stays the same.
-	 *
-	 * @since 7.4
-	 */
-	public function clear();
-
 }

src/Entity/Item.php

@@ -343,7 +343,7 @@ public function __clone() {
 	}
 
 	/**
-	 * @since 7.4
+	 * @since 7.5
 	 */
 	public function clear() {
 		$this->fingerprint = new Fingerprint();

src/Entity/Property.php

@@ -298,7 +298,7 @@ public function __clone() {
 	}
 
 	/**
-	 * @since 7.4
+	 * @since 7.5
 	 */
 	public function clear() {
 		$this->fingerprint = new Fingerprint();