fix: FP variable might not be defined when in while and try-catch#671
Closed
ishan-deepsource wants to merge 4 commits intophpstan:masterfrom
ishan-deepsource:bug-5477
Closed
fix: FP variable might not be defined when in while and try-catch#671ishan-deepsource wants to merge 4 commits intophpstan:masterfrom ishan-deepsource:bug-5477
ishan-deepsource wants to merge 4 commits intophpstan:masterfrom
ishan-deepsource:bug-5477
Conversation
Signed-off-by: Ishan Vyas <ishan@deepsource.io>
ondrejmirtes
requested changes
Sep 15, 2021
src/Analyser/NodeScopeResolver.php
Outdated
| $branchScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $scope, $nodeCallback); | ||
| $branchScope = $branchScopeResult->getScope(); | ||
| $finalScope = $branchScopeResult->isAlwaysTerminating() ? null : $branchScope; | ||
| $finalScope = $branchScopeResult->getScope()->mergeWith($finalScope); |
Member
There was a problem hiding this comment.
To me it looks like you're merging $branchScope with $branchScope or null. Are you sure?
Author
There was a problem hiding this comment.
No, I'm merging $branchScopeResult's $finalScope with $finalScope. This is the only way I could think of fixing this issue, is it proper?
Member
There was a problem hiding this comment.
You might be right but I might be blind, but what I see is:
$branchScope = $branchScopeResult->getScope();
$finalScope = $branchScopeResult->isAlwaysTerminating() ? null : $branchScope;
$finalScope = $branchScopeResult->getScope()->mergeWith($finalScope);Which can be rewritten as:
$branchScope = $branchScopeResult->getScope();
$finalScope = $branchScopeResult->isAlwaysTerminating() ? null : $branchScope;
$finalScope = $branchScope->mergeWith($finalScope); // $finalScope from previous line is null or $branchScope
// therefore you're doing either $branchScope->mergeWith($branchScope) or $branchScope->mergeWith(null)Can you oppose what I see? :)
Author
There was a problem hiding this comment.
Yeah, you're right. Pushed latest changes, in this case $finalScope is null, so in order to fix this assigning $branchScope's scope to $finalScope.
Signed-off-by: Ishan Vyas <ishan@deepsource.io>
Signed-off-by: Ishan Vyas <ishan@deepsource.io>
Member
|
Still too many build failures. Feel free to start fresh on top of latest master in a new PR, thanks. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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#5477