Narrow array on count() with positive-int #3389
Merged
+109
−53
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
staabm
commented
Sep 2, 2024
Comment on lines
-47
to
-52
| assertType('non-empty-array', $arr); | ||
| assertType('array', $arr); | ||
| } | ||
| if (count($arr) === $maybeZero) { | ||
| assertType('array', $arr); | ||
| } else { | ||
| assertType('non-empty-array', $arr); |
There was a problem hiding this comment.
I think I did a mistake here in previous PR, as the array can still be empty in the else branch
staabm
commented
Sep 2, 2024
| @@ -1046,7 +1047,7 @@ private function turnListIntoConstantArray(FuncCall $countFuncCall, Type $type, | |||
| $offsetType = new ConstantIntegerType($i); | |||
| $valueTypesBuilder->setOffsetValueType($offsetType, $type->getOffsetValueType($offsetType), true); | |||
| } | |||
| } else { | |||
| } elseif ($type->isConstantArray()->yes()) { | |||
There was a problem hiding this comment.
compensated the now passed in maybe unbound IntegerRangeTypes
|
This pull request has been marked as ready for review. |
staabm
commented
Sep 2, 2024
| && count($unwrappedLeftExpr->getArgs()) >= 1 | ||
| && $unwrappedLeftExpr->name instanceof Name | ||
| && in_array(strtolower((string) $unwrappedLeftExpr->name), ['count', 'sizeof'], true) | ||
| && $rightType->isInteger()->yes() |
There was a problem hiding this comment.
uses now a proper Type method instead of && $constantType instanceof ConstantIntegerType
staabm
force-pushed
the
count-const
branch
2 times, most recently
from
a47ea23 to
5b20101
Compare
|
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.
With this PR we also narrow in case of unbound integer ranges
separated from #3373