Remove deprecated options to use snak hashes

This follows through with the deprecation of the separate options in
4f558c9, leaving only the single unified option behind to control
whether snak hashes of any kind are included or not.

Author: lucaswerkmeister

RELEASE-NOTES.md

@@ -1,5 +1,13 @@
 # Wikibase DataModel Serialization release notes
 
+## 3.0.0 (dev)
+
+* Removed the deprecated `SerializerFactory` options
+  `OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH`,
+  `OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH` and
+  `OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH`
+  (use `OPTION_SERIALIZE_SNAKS_WITHOUT_HASH` instead)
+
 ## 2.5.0 (2017-08-30)
 
 * Removed MediaWiki integration files

src/SerializerFactory.php

@@ -35,29 +35,11 @@ class SerializerFactory {
 	const OPTION_DEFAULT = 0;
 	/** @since 1.2.0 */
 	const OPTION_OBJECTS_FOR_MAPS = 1;
-	/**
-	 * @since 1.7.0
-	 * @deprecated since 2.5 use OPTION_SERIALIZE_SNAKS_WITHOUT_HASH
-	 */
-	const OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH = 2;
-	/**
-	 * @since 1.7.0
-	 * @deprecated since 2.5 use OPTION_SERIALIZE_SNAKS_WITHOUT_HASH
-	 */
-	const OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH = 4;
-	/**
-	 * @since 1.7.0
-	 * @deprecated since 2.5 use OPTION_SERIALIZE_SNAKS_WITHOUT_HASH
-	 */
-	const OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH = 8;
 	/**
 	 * Omit hashes when serializing snaks.
 	 * @since 2.5.0
 	 */
-	const OPTION_SERIALIZE_SNAKS_WITHOUT_HASH = 14; /* =
-		self::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH |
-		self::OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH |
-		self::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH; */
+	const OPTION_SERIALIZE_SNAKS_WITHOUT_HASH = 2;
 
 	/**
 	 * @var int
@@ -94,22 +76,8 @@ private function shouldUseObjectsForMaps() {
 	/**
 	 * @return bool
 	 */
-	private function shouldSerializeMainSnaksWithHash() {
-		return !(bool)( $this->options & self::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH );
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function shouldSerializeQualifierSnaksWithHash() {
-		return !(bool)( $this->options & self::OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH );
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function shouldSerializeReferenceSnaksWithHash() {
-		return !(bool)( $this->options & self::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH );
+	private function shouldSerializeSnaksWithHash() {
+		return !(bool)( $this->options & self::OPTION_SERIALIZE_SNAKS_WITHOUT_HASH );
 	}
 
 	/**
@@ -188,8 +156,8 @@ public function newStatementListSerializer() {
 	 */
 	public function newStatementSerializer() {
 		return new StatementSerializer(
-			$this->newSnakSerializer( $this->shouldSerializeMainSnaksWithHash() ),
-			$this->newSnakListSerializer( $this->shouldSerializeQualifierSnaksWithHash() ),
+			$this->newSnakSerializer( $this->shouldSerializeSnaksWithHash() ),
+			$this->newSnakListSerializer( $this->shouldSerializeSnaksWithHash() ),
 			$this->newReferencesSerializer()
 		);
 	}
@@ -210,9 +178,7 @@ public function newReferencesSerializer() {
 	 */
 	public function newReferenceSerializer() {
 		return new ReferenceSerializer(
-			$this->newSnakListSerializer(
-				$this->shouldSerializeReferenceSnaksWithHash()
-			)
+			$this->newSnakListSerializer( $this->shouldSerializeSnaksWithHash() )
 		);
 	}
 

tests/unit/SerializerFactoryTest.php

@@ -158,15 +158,4 @@ public function testNewAliasGroupListSerializer() {
 		);
 	}
 
-	public function testSerializeSnaksWithoutHashConstant() {
-		$this->assertSame(
-			// expected:
-			SerializerFactory::OPTION_SERIALIZE_MAIN_SNAKS_WITHOUT_HASH |
-			SerializerFactory::OPTION_SERIALIZE_QUALIFIER_SNAKS_WITHOUT_HASH |
-			SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH,
-			// actual:
-			SerializerFactory::OPTION_SERIALIZE_SNAKS_WITHOUT_HASH
-		);
-	}
-
 }