Fix various array spread issues. #8044
Merged
+487
−113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Also unblocks #7319. |
AndrolGenhald
added
the
release:fix
orklah
reviewed
Jun 2, 2022
src/Psalm/Internal/Analyzer/Statements/Expression/ArrayAnalyzer.php
Outdated
Show resolved
Hide resolved
orklah
reviewed
Jun 2, 2022
orklah
reviewed
Jun 2, 2022
| @@ -55,4 +55,6 @@ class ArrayCreationInfo | |||
| * @var array<string, DataFlowNode> | |||
| */ | |||
| public $parent_taint_nodes = []; | |||
|
|
|||
| public bool $can_be_empty = true; | |||
There was a problem hiding this comment.
@weirdan I probably let some slip before, but what do we want to do with typed properties? I'd be all for it, but I remember Matt saying there's a performance issues on hot paths. Should we enforce that one way or another?
|
Looks great! |
AndrolGenhald
commented
Jun 2, 2022
AndrolGenhald
commented
Jun 6, 2022
Comment on lines
-503
to
515
| $array_creation_info->item_value_atomic_types[] = new TMixed(); | ||
|
|
||
| if ($item_key_value !== null | ||
| && count($array_creation_info->property_types) <= $config->max_shaped_array_size | ||
| ) { | ||
| $array_creation_info->property_types[$item_key_value] = Type::getMixed(); | ||
| } else { | ||
| $array_creation_info->can_create_objectlike = false; | ||
| $array_creation_info->item_key_atomic_types = array_merge( | ||
| $array_creation_info->item_key_atomic_types, | ||
| array_values($key_type->getAtomicTypes()) | ||
| ); | ||
| $array_creation_info->item_value_atomic_types[] = new TMixed(); | ||
| } |
There was a problem hiding this comment.
This is actually untested and I couldn't find a way to test it.
|
I'll wait after merging 4.x on master to merge this, it'll probably be easier for you to resolve the conflict |
- Correctly infer `array` and `list` instead of `non-empty-array` and `non-empty-list` (fixes vimeo#7296) - Add support for spreading string keys (fixes vimeo#7297). - Show issue when trying to unpack non-iterable - Show issue when trying to unpack iterable with non-array-key key - Re-added invalid PHP 8.0 tests removed in vimeo#6613 - Unpacked lists with known keys will be inferred as eg `array{0: int, 1: int}<int<0, max>, int>` now but will still be treated as lists - Unpacked arrays with known keys will now be inferred as eg `array{a: string, b: string}<int, int>` instead of `array<int|string, int|string>`
AndrolGenhald
force-pushed
the
feature/improve-array-spreading
branch
from
56c88d9 to
094621d
Compare
|
Rebased, should be gtg now, @orklah not sure if you're done reviewing. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
arrayandlistinstead ofnon-empty-arrayandnon-empty-list(fixes Spread in array incorrectly produces non-empty list #7296)array{0: int, 1: int}<int<0, max>, int>now but will still be treated as listsarray{a: string, b: string}<int, int>instead ofarray<int|string, int|string>