Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to intersect type alias with non-type-aliases #9638

Merged
merged 8 commits into from
Apr 16, 2023
Merged

Allow to intersect type alias with non-type-aliases #9638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
93c71fe
feature: introduce `CallableTrait#getParamString` and `CallableTrait#…
boesing Apr 11, 2023
6ea4b56
qa: introduce failing test for type-aliased intersection string
boesing Apr 11, 2023
e72af4e
feature: allow aliased types within intersection strings
boesing Apr 11, 2023
094df27
feature: add param and return type string to `TCallableObject#getKey`…
boesing Apr 11, 2023
1071257
refactor: resolve `TTypeAlias` in intersections
boesing Apr 11, 2023
c3f9199
bugfix: ensure object and arrays are not intersectable
boesing Apr 12, 2023
07fcf53
qa: mark `TTypeAlias#extra_types` and `TTypeAlias#setIntersectionType…
boesing Apr 14, 2023
26e201d
refactor: intersect keyed arrays the same way as in early return
boesing Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/Psalm/Internal/Type/TypeExpander.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down