Improve

Author: VincentLanglet

src/Type/ObjectType.php

@@ -1554,17 +1554,20 @@ 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)) {
-				continue;
-			}
+		if ($typeToRemove instanceof ObjectType) {
+			foreach (UnionType::EQUAL_UNION_CLASSES as $baseClass => $classes) {
+				if ($this->getClassName() !== $baseClass) {
+					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),
-					);
+				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

@@ -205,6 +205,7 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 			if ($this->accepts($union, $strictTypes)->yes()) {
 				return AcceptsResult::createYes();
 			}
+			break;
 		}
 
 		$result = AcceptsResult::createNo();