Narrow arrays in union based on count() with smaller/greater operator #3324
+177
−32
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
Aug 13, 2024
src/Analyser/TypeSpecifier.php
Outdated
| } | ||
| } | ||
|
|
||
| $result[] = $innerType; |
There was a problem hiding this comment.
I'd like some DRY around this, we already have the same code elsewhere. We could have a method that just accepts the narrowed array size as Type, and return SpecifiedTypes.
src/Analyser/TypeSpecifier.php
Outdated
| if ($orEqual) { | ||
| $constantType = IntegerRangeType::createAllGreaterThanOrEqualTo($leftType->getValue()); | ||
| } else { | ||
| $constantType = IntegerRangeType::createAllGreaterThan($leftType->getValue()); |
There was a problem hiding this comment.
We already have this elsewhere:
$context->true() && (IntegerRangeType::createAllGreaterThanOrEqualTo(1 - $offset)->isSuperTypeOf($leftType)->yes())
|| ($context->false() && (new ConstantIntegerType(1 - $offset))->isSuperTypeOf($leftType)->yes())Would be nice to reuse that.
There was a problem hiding this comment.
I don't think its the same thing. in the first block we work on the concrete constant integer, used in the comparison while in the second block we just check for the comparison value beeing >0 or >1.
|
This pull request has been marked as ready for review. |
|
Awesome, 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.
closes phpstan/phpstan#11480