Re-enable Phan and fix warnings / errors for `data-model/src'

Some directories are excluded from Phan checks as a result of
T289040. .phan/config.php includes the folders for the
libraries in exclude_analysis_directory_list. Enabling Phan
checks results in a build failure.

Resolve the Phan warnings and re-enable checks for the
`data-model/src` folder.

Bug: T353623
Change-Id: Ie7ec30e95f027361efcbfb5c22510f1261c61de1

Author: codders

src/ByPropertyIdArray.php

@@ -307,6 +307,9 @@ private function movePropertyGroup( PropertyId $propertyId, $toIndex ) {
 
 		$oldIndex = $this->getPropertyGroupIndex( $propertyId );
 		$byIdClone = $this->byId;
+		if ( $byIdClone === null ) {
+			throw new RuntimeException( 'LogicError - index should have been built' );
+		}
 
 		// Remove "property group" to calculate the groups new index:
 		unset( $this->byId[$propertyId->getSerialization()] );
@@ -432,7 +435,7 @@ public function addObjectAtIndex( $object, $index = null ) {
 		if ( count( $this ) === 0 ) {
 			// Array is empty, just append object.
 			$this->append( $object );
-		} elseif ( empty( $validIndices ) ) {
+		} elseif ( $validIndices === [] ) {
 			// No objects featuring that property exist. The object may be inserted at a place
 			// between existing "property groups".
 			$this->append( $object );
@@ -461,7 +464,7 @@ private function addObjectToPropertyGroup( $object, $index = null ) {
 		$propertyId = $object->getPropertyId();
 		$validIndices = $this->getFlatArrayIndices( $propertyId );
 
-		if ( empty( $validIndices ) ) {
+		if ( $validIndices === [] ) {
 			throw new OutOfBoundsException( 'No objects featuring the object\'s property exist' );
 		}
 
@@ -473,6 +476,10 @@ private function addObjectToPropertyGroup( $object, $index = null ) {
 			$index = end( $validIndices );
 		}
 
+		if ( $this->byId === null ) {
+			throw new RuntimeException( 'LogicError - index should have been built' );
+		}
+
 		if ( in_array( $index, $validIndices ) ) {
 			// Add object at index within "property group".
 			$this->byId[$propertyId->getSerialization()][] = $object;

src/Entity/BasicEntityIdParser.php

@@ -21,7 +21,7 @@ public function __construct() {
 	/**
 	 * @param string $idSerialization
 	 *
-	 * @return ItemId|PropertyId
+	 * @return EntityId
 	 * @throws EntityIdParsingException
 	 */
 	public function parse( $idSerialization ) {

src/Entity/Item.php

@@ -87,7 +87,7 @@ public function getId() {
 	/**
 	 * @since 0.5, can be null since 1.0
 	 *
-	 * @param ItemId|null $id
+	 * @param EntityId|null $id
 	 *
 	 * @throws InvalidArgumentException
 	 */

src/Entity/ItemIdSet.php

@@ -51,7 +51,7 @@ public function count(): int {
 	/**
 	 * @see IteratorAggregate::getIterator
 	 *
-	 * @return Iterator|ItemId[]
+	 * @return Traversable<ItemId>
 	 */
 	public function getIterator(): Traversable {
 		return new ArrayIterator( $this->ids );

src/Entity/Property.php

@@ -90,7 +90,7 @@ public function getId() {
 	/**
 	 * @since 0.5, can be null since 1.0
 	 *
-	 * @param PropertyId|null $id
+	 * @param EntityId|null $id
 	 *
 	 * @throws InvalidArgumentException
 	 */

src/Internal/MapValueHasher.php

@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Traversable;
+use Wikibase\DataModel\Reference;
 
 /**
  * Generates hashes for associative arrays based on the values of their elements.
@@ -27,14 +28,14 @@ public function __construct( $holdOrderIntoAccount = false ) {
 	 *
 	 * @since 0.1
 	 *
-	 * @param Traversable $map
+	 * @param Traversable|Reference[] $map
 	 *
 	 * @return string
 	 * @throws InvalidArgumentException
 	 */
 	public function hash( $map ) {
 		if ( !is_iterable( $map ) ) {
-			throw new InvalidArgumentException( '$map must be an array or an instance of Traversable' );
+			throw new InvalidArgumentException( '$map must be a Reference array or an instance of Traversable' );
 		}
 
 		$hashes = [];

src/ReferenceList.php

@@ -269,7 +269,7 @@ public function unserialize( $serialized ) {
 	 * @return bool
 	 */
 	public function isEmpty() {
-		return empty( $this->references );
+		return $this->references === [];
 	}
 
 	/**
@@ -316,7 +316,7 @@ public function count(): int {
 	 *
 	 * @since 5.0
 	 *
-	 * @return Iterator|Reference[]
+	 * @return Traversable<Reference>
 	 */
 	public function getIterator(): Traversable {
 		return new ArrayIterator( array_values( $this->references ) );

src/SiteLinkList.php

@@ -5,7 +5,6 @@
 use ArrayIterator;
 use Countable;
 use InvalidArgumentException;
-use Iterator;
 use IteratorAggregate;
 use OutOfBoundsException;
 use Traversable;
@@ -103,7 +102,7 @@ public function setNewSiteLink( $siteId, $pageName, $badges = null ) {
 	 *
 	 * Returns an Iterator of SiteLink in which the keys are the site ids.
 	 *
-	 * @return Iterator|SiteLink[]
+	 * @return Traversable<SiteLink>
 	 */
 	public function getIterator(): Traversable {
 		return new ArrayIterator( $this->siteLinks );
@@ -172,7 +171,7 @@ public function equals( $target ) {
 	 * @return bool
 	 */
 	public function isEmpty() {
-		return empty( $this->siteLinks );
+		return $this->siteLinks === [];
 	}
 
 	/**

src/Snak/PropertyValueSnak.php

@@ -72,14 +72,14 @@ private function getDataValueSerializationForHash(): string {
 		if ( method_exists( $this->dataValue, 'getSerializationForHash' ) ) {
 			// If our DataValue provides/ needs a special serialization for
 			// hashing, use it (currently only EntityIdValue).
+			// @phan-suppress-next-line PhanUndeclaredMethod
 			return $this->dataValue->getSerializationForHash();
-		} else {
-			$innerSerialization = $this->dataValue->serialize();
 		}
+		$innerSerialization = $this->dataValue->serialize();
 		$className = get_class( $this->dataValue );
 
 		return 'C:' . strlen( $className ) . ':"' . $className .
-			'":' . strlen( $innerSerialization ) . ':{' . $innerSerialization . '}';
+			'":' . strlen( $innerSerialization ?? '' ) . ':{' . $innerSerialization . '}';
 	}
 
 	/**

src/Snak/SnakList.php

@@ -241,7 +241,10 @@ public function offsetSet( $index, $value ): void {
 	 * all common code needed for set operations, including
 	 * type checking and offset resolving.
 	 *
-	 * @param int|string $index
+	 * If null is supplied as an index, the next new offset
+	 * will be assigned.
+	 *
+	 * @param int|string|null $index
 	 * @param Snak $value
 	 *
 	 * @throws InvalidArgumentException