Fix ObjectType::equals() treating generic and non-generic types as equal

- ObjectType::equals(GenericObjectType) incorrectly returned true when both had the same class name, because it didn't check whether generic type arguments differed
- This caused MutatingScope::mergeWith() native type optimization to replace native types (e.g. ArrayObject) with PHPDoc-enriched types (e.g. ArrayObject<string, string>), contaminating native type tracking after any branch merge
- With treatPhpDocTypesAsCertain: false, this led to false "will always evaluate to true" errors for is_string/is_int checks on foreach values from generic objects
- Added get_class equality check in ObjectType::equals() which also subsumes the old instanceof EnumCaseObjectType check
- Removed now-unneeded baseline entry for the EnumCaseObjectType instanceof check
- New regression test in tests/PHPStan/Rules/Comparison/data/bug-14429.php

Author: VincentLanglet

phpstan-baseline.neon

@@ -1473,12 +1473,6 @@ parameters:
 			count: 1
 			path: src/Type/ObjectShapeType.php
 
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Enum\EnumCaseObjectType is error-prone and deprecated. Use Type::getEnumCases() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Type/ObjectType.php
-
 		-
 			rawMessage: Doing instanceof PHPStan\Type\Generic\GenericObjectType is error-prone and deprecated.
 			identifier: phpstanApi.instanceofType

src/Type/ObjectType.php

@@ -56,6 +56,7 @@
 use function array_map;
 use function array_values;
 use function count;
+use function get_class;
 use function implode;
 use function in_array;
 use function sprintf;
@@ -628,7 +629,7 @@ public function equals(Type $type): bool
 			return false;
 		}
 
-		if ($type instanceof EnumCaseObjectType) {
+		if (get_class($type) !== static::class) {
 			return false;
 		}
 

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -1207,4 +1207,11 @@ public function testBug13799(): void
 		]);
 	}
 
+	#[RequiresPhp('>= 8.1')]
+	public function testBug14429(): void
+	{
+		$this->treatPhpDocTypesAsCertain = false;
+		$this->analyse([__DIR__ . '/data/bug-14429.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-14429.php

@@ -0,0 +1,43 @@
+<?php // lint >= 8.1
+
+declare(strict_types = 1);
+
+namespace Bug14429;
+
+function throw_if(bool $condition, string $message): void
+{
+	if ($condition) { throw new \Exception($message); }
+}
+
+class Foo
+{
+	/**
+	 * @param list<string> $tags
+	 * @param list<float> $scores
+	 * @param \ArrayObject<string, string> $stringMap
+	 * @param \ArrayObject<string, int> $intKeyMap
+	 */
+	public function __construct(
+		public array $tags,
+		public array $scores,
+		public ?\ArrayObject $stringMap = null,
+		public ?\ArrayObject $intKeyMap = null,
+	) {
+		foreach ($tags as $tagsItem) {
+			throw_if(!is_string($tagsItem), 'tags item must be string');
+		}
+		foreach ($scores as $scoresItem) {
+			throw_if(!is_int($scoresItem) && !is_float($scoresItem), 'scores item must be number');
+		}
+		if ($stringMap !== null) {
+			foreach ($stringMap as $stringMapValue) {
+				throw_if(!is_string($stringMapValue), 'stringMap value must be string');
+			}
+		}
+		if ($intKeyMap !== null) {
+			foreach ($intKeyMap as $intKeyMapValue) {
+				throw_if(!is_int($intKeyMapValue), 'intKeyMap value must be int');
+			}
+		}
+	}
+}