Merge pull request #9638 from boesing/bugfix/intersection-type-type-a…

…lias Allow to intersect type alias with non-type-aliases
vimeo · Apr 16, 2023 · 24dc5d4 · 24dc5d4
2 parents 2a6d9a8 + 26e201d
commit 24dc5d4
Show file tree

Hide file tree

Showing 8 changed files with 295 additions and 137 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -410,7 +410,6 @@
     <PossiblyUndefinedIntArrayOffset>
       <code>$const_name</code>
       <code>$const_name</code>
-      <code>$intersection_types[0]</code>
       <code><![CDATA[$parse_tree->children[0]]]></code>
       <code><![CDATA[$parse_tree->condition->children[0]]]></code>
       <code>array_keys($offset_template_data)[0]</code>

diff --git a/src/Psalm/Internal/Type/TypeExpander.php b/src/Psalm/Internal/Type/TypeExpander.php
@@ -324,6 +324,7 @@ public static function expandAtomic(
                 ];
             }
 
+            /** @psalm-suppress DeprecatedProperty For backwards compatibility, we have to keep this here. */
             foreach ($return_type->extra_types ?? [] as $alias) {
                 $more_recursively_fleshed_out_types = self::expandAtomic(
                     $codebase,