Merge branch '5.x' into upstream-master

vimeo · Aug 28, 2023 · 722bec7 · 722bec7
2 parents b0521f3 + cc7ed95
commit 722bec7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -1629,9 +1629,7 @@ private static function resolveTypeAliases(Codebase $codebase, array $intersecti
                 continue;
             }
 
-            $modified = true;
-
-            $normalized_intersection_types[] = TypeExpander::expandAtomic(
+            $expanded_intersection_type = TypeExpander::expandAtomic(
                 $codebase,
                 $intersection_type,
                 null,
@@ -1644,6 +1642,9 @@ private static function resolveTypeAliases(Codebase $codebase, array $intersecti
                 true,
                 true,
             );
+
+            $modified = $modified || $expanded_intersection_type[0] !== $intersection_type;
+            $normalized_intersection_types[] = $expanded_intersection_type;
         }
 
         if ($modified === false) {