Fix constant array comparison for optional keys #1324
Merged
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
ondrejmirtes
requested changes
May 17, 2022
src/Analyser/MutatingScope.php
Outdated
| @@ -2274,19 +2274,19 @@ private function resolveEqualType(Type $leftType, Type $rightType): BooleanType | |||
| */ | |||
| private function resolveConstantArrayTypeComparison(ConstantArrayType $leftType, ConstantArrayType $rightType, callable $valueComparisonCallback): BooleanType | |||
| { | |||
| $leftValueTypes = $leftType->getValueTypes(); | |||
| if ($leftType->hasOptionalKeys() || $rightType->hasOptionalKeys()) { | |||
| return new BooleanType(); | |||
There was a problem hiding this comment.
We can tell when it's always false even when optional keys are involved. This code doesn't seem right.
if I have array{a?: int} and array{b? int}, it can be true because both arrays can be empty.
But if I have array{c, int, d?: int}, array{e: int, f?: int}, we can be sure it's always false.
There was a problem hiding this comment.
That is already handled by the supertype check in resolveIdenticalType. I've added these as test cases.
|
I can merge this if it's ready :) |
rvanvelzen
force-pushed
the
constant-array-supertype
branch
from
4f1079c
to
c570bc7
Compare
|
It didn't work for the |
|
Thank you! |
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.
Fixes phpstan/phpstan#7248. When optional keys are involved it's never certain whether to values are equal.