Merge "Re-enable Phan and fix warnings for `data-model-serialization'"

wikimedia · Mar 3, 2025 · 5ee4370 · 5ee4370
2 parents bd2f9cf + 9db2aaa
commit 5ee4370
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.phan/config.php b/.phan/config.php
@@ -65,7 +65,6 @@
 $cfg['exclude_analysis_directory_list'] = array_merge(
 	$cfg['exclude_analysis_directory_list'],
 	[
-		'lib/packages/wikibase/data-model-serialization/src/',
 		'lib/packages/wikibase/data-model-services/src/',
 		'lib/packages/wikibase/internal-serialization/src/',
 		'../../extensions/Babel/',

diff --git a/lib/packages/wikibase/data-model-serialization/src/Deserializers/SnakDeserializer.php b/lib/packages/wikibase/data-model-serialization/src/Deserializers/SnakDeserializer.php
@@ -159,7 +159,7 @@ private function needsDataTypeLookup( string $valueType ): bool {
 			array_keys( $this->dataTypeToValueTypeMap, $valueType, true )
 		);
 
-		return !empty( array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) );
+		return array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) !== [];
 	}
 
 	/**

diff --git a/lib/packages/wikibase/data-model-serialization/src/Serializers/AliasGroupListSerializer.php b/lib/packages/wikibase/data-model-serialization/src/Serializers/AliasGroupListSerializer.php
@@ -26,7 +26,7 @@ public function __construct( AliasGroupSerializer $aliasGroupSerializer, bool $u
 
 	/**
 	 * @param AliasGroupList $object
-	 * @return array|::stdClass
+	 * @return array|\stdClass
 	 */
 	public function serialize( $object ) {
 		$this->assertIsSerializerFor( $object );

diff --git a/lib/packages/wikibase/data-model-serialization/src/Serializers/MapSerializer.php b/lib/packages/wikibase/data-model-serialization/src/Serializers/MapSerializer.php
@@ -31,7 +31,7 @@ public function __construct( bool $useObjectsForEmptyMaps ) {
 	 * @return array|\stdClass
 	 */
 	protected function serializeMap( array $serialization ) {
-		if ( $this->useObjectsForEmptyMaps && empty( $serialization ) ) {
+		if ( $this->useObjectsForEmptyMaps && $serialization === [] ) {
 			$serialization = (object)$serialization;
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			array_keys( $this->dataTypeToValueTypeMap, $valueType, true )
     		);
-    		return !empty( array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) );
+    		return array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) !== [];
     	}
     	/**
@@ Expand Down @@