Narrow string on strlen() == and === comparison with integer-range #3342
+151
−24
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
Aug 22, 2024
src/Analyser/TypeSpecifier.php
Outdated
| @@ -2172,6 +2172,29 @@ public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, Ty | |||
| } | |||
| } | |||
|
|
|||
| if ($rightType instanceof IntegerRangeType) { | |||
There was a problem hiding this comment.
inspired by the previous loop with constant-strings, I have added a similar case for integer ranges
staabm
commented
Aug 22, 2024
Comment on lines
-1093
to
-1096
| if ($constantType->getValue() === null) { | ||
| return $this->create($exprNode, $constantType, $context, false, $scope, $rootExpr); | ||
| } | ||
|
|
There was a problem hiding this comment.
looked like dead code
staabm
commented
Aug 23, 2024
|
This pull request has been marked as ready for review. |
|
This pull request has been marked as ready for review. |
staabm
commented
Aug 27, 2024
| @@ -1102,6 +1104,10 @@ private function specifyTypesForConstantBinaryExpression( | |||
| && in_array(strtolower((string) $exprNode->name), ['count', 'sizeof'], true) | |||
| && $constantType instanceof ConstantIntegerType | |||
There was a problem hiding this comment.
in a followup PR I would factor out the 2 $constantType instanceof ConstantIntegerType if-blocks of this method into the parent caller and do a proper integer range check instead, which will fix phpstan/phpstan#11558
I don't do it now to keep this PR simpler and the next one will also be easier to review
|
This pull request has been marked as ready for review. |
simplify Update TypeSpecifier.php Update TypeSpecifier.php remove seemingly dead code Update strlen-int-range.php more tests more tests test count on int-range more tests more assertions fix negative context cs simplify
|
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#11548
after implementing I realized this also makes
count($arr) == integer-rangenarrow tonon-empty-array