Fix

Author: VincentLanglet

phpstan-baseline.neon

@@ -1279,7 +1279,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
-			count: 6
+			count: 3
 			path: src/Type/ObjectType.php
 
 		-

src/Type/ObjectType.php

@@ -41,7 +41,6 @@
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
 use PHPStan\Type\Traits\UndecidedComparisonTypeTrait;
-use Throwable;
 use Traversable;
 use function array_key_exists;
 use function array_map;
@@ -1584,14 +1583,16 @@ private function getInterfaces(): array
 	public function tryRemove(Type $typeToRemove): ?Type
 	{
 		foreach (UnionType::EQUAL_UNION_CLASSES as $baseClass => $classes) {
-			if ($this->getClassName() === $baseClass && $typeToRemove instanceof ObjectType) {
-				foreach ($classes as $index => $class) {
-					if ($typeToRemove->getClassName() === $class) {
-						unset($classes[$index]);
-						return TypeCombinator::union(
-							...array_map(static fn (string $objectClass): Type => new ObjectType($objectClass), $classes)
-						);
-					}
+			if ($this->getClassName() !== $baseClass || !($typeToRemove instanceof ObjectType)) {
+				continue;
+			}
+
+			foreach ($classes as $index => $class) {
+				if ($typeToRemove->getClassName() === $class) {
+					unset($classes[$index]);
+					return TypeCombinator::union(
+						...array_map(static fn (string $objectClass): Type => new ObjectType($objectClass), $classes),
+					);
 				}
 			}
 		}

src/Type/UnionType.php

@@ -6,7 +6,6 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use Error;
-use Exception;
 use Iterator;
 use IteratorAggregate;
 use PHPStan\Php\PhpVersion;
@@ -53,7 +52,7 @@ class UnionType implements CompoundType
 
 	public const EQUAL_UNION_CLASSES = [
 		DateTimeInterface::class => [DateTimeImmutable::class, DateTime::class],
-		Throwable::class => [Error::class, Exception::class],
+		Throwable::class => [Error::class, Throwable::class],
 		Traversable::class => [IteratorAggregate::class, Iterator::class],
 	];
 
@@ -204,13 +203,15 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 	{
 		foreach (self::EQUAL_UNION_CLASSES as $baseClass => $classes) {
-			if ($type->equals(new ObjectType($baseClass))) {
-				$union = TypeCombinator::union(
-					...array_map(static fn (string $objectClass): Type => new ObjectType($objectClass), $classes)
-				);
-				if ($this->accepts($union, $strictTypes)->yes()) {
-					return AcceptsResult::createYes();
-				}
+			if (!$type->equals(new ObjectType($baseClass))) {
+				continue;
+			}
+
+			$union = TypeCombinator::union(
+				...array_map(static fn (string $objectClass): Type => new ObjectType($objectClass), $classes),
+			);
+			if ($this->accepts($union, $strictTypes)->yes()) {
+				return AcceptsResult::createYes();
 			}
 		}