Rewrite multi param isset() to and-chain #2709
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
staabm
commented
Nov 2, 2023
| } | ||
|
|
||
| $types = null; | ||
| $tmpVars = [$issetExpr]; |
There was a problem hiding this comment.
I had to rename this var, because the previous $var variable after this PR is no longer within a foreach and therefore PHPStan would otherwise report a overlap with the foreach-var below
(no logic change contained otherwise in this block)
staabm
commented
Nov 2, 2023
|
|
||
| $specifiedTypes = new SpecifiedTypes(); | ||
| // rewrite multi param isset() to and-chained single param isset() | ||
| if (count($expr->vars) > 1) { |
There was a problem hiding this comment.
the actual change is here.
Implemented the idea expressed in phpstan/phpstan#8366 (comment)
|
This pull request has been marked as ready for review. |
|
ahh, let me add a regression test for phpstan/phpstan#10064 |
ondrejmirtes
requested changes
Nov 2, 2023
| ): void { | ||
|
|
||
| if (isset($untilDate, $count)) { | ||
| throw new \InvalidArgumentException('Too much params, choose between until and count.'); |
There was a problem hiding this comment.
Additional assertType calls inside this condition would be great
|
Thank you. |
This was referenced Nov 2, 2023
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.
motivation: ease impl of #2657 by moving the expr-var loop before the context true/false branches which simplifies the branch cases
closes phpstan/phpstan#8366
closes phpstan/phpstan#10064