Merge pull request #600 from wmde/entityIdInjection

Simplify ReferenceList::unserialize

Author: mariushoch

src/Entity/EntityIdValue.php

@@ -52,12 +52,12 @@ protected function getNumericId() {
 	 *
 	 * @since 0.5
 	 *
-	 * @param string $value
+	 * @param string $serialized
 	 *
 	 * @throws IllegalValueException
 	 */
-	public function unserialize( $value ) {
-		list( $entityType, $numericId ) = json_decode( $value );
+	public function unserialize( $serialized ) {
+		list( $entityType, $numericId ) = json_decode( $serialized );
 
 		try {
 			$entityId = LegacyIdInterpreter::newIdFromTypeAndNumber( $entityType, $numericId );

src/Entity/ItemId.php

@@ -63,10 +63,10 @@ public function serialize() {
 	/**
 	 * @see Serializable::unserialize
 	 *
-	 * @param string $value
+	 * @param string $serialized
 	 */
-	public function unserialize( $value ) {
-		list( , $this->serialization ) = json_decode( $value );
+	public function unserialize( $serialized ) {
+		list( , $this->serialization ) = json_decode( $serialized );
 	}
 
 	/**

src/Entity/PropertyId.php

@@ -63,10 +63,10 @@ public function serialize() {
 	/**
 	 * @see Serializable::unserialize
 	 *
-	 * @param string $value
+	 * @param string $serialized
 	 */
-	public function unserialize( $value ) {
-		list( , $this->serialization ) = json_decode( $value );
+	public function unserialize( $serialized ) {
+		list( , $this->serialization ) = json_decode( $serialized );
 	}
 
 	/**

src/HashArray.php

@@ -454,10 +454,10 @@ public function serialize() {
 	/**
 	 * @see Serializable::unserialize
 	 *
-	 * @param string $serialization
+	 * @param string $serialized
 	 */
-	public function unserialize( $serialization ) {
-		$serializationData = unserialize( $serialization );
+	public function unserialize( $serialized ) {
+		$serializationData = unserialize( $serialized );
 
 		foreach ( $serializationData['data'] as $offset => $value ) {
 			// Just set the element, bypassing checks and offset resolving,

src/ReferenceList.php

@@ -217,10 +217,10 @@ public function serialize() {
 	 *
 	 * @since 2.1
 	 *
-	 * @param string $data
+	 * @param string $serialized
 	 */
-	public function unserialize( $data ) {
-		$this->__construct( unserialize( $data ) );
+	public function unserialize( $serialized ) {
+		$this->references = unserialize( $serialized );
 	}
 
 	/**