Fix 10922: array type in foreach#3029
Merged
ondrejmirtes merged 2 commits intophpstan:1.10.xfrom Apr 23, 2024
Merged
Conversation
VincentLanglet
commented
Apr 23, 2024
src/Analyser/NodeScopeResolver.php
Outdated
| @@ -951,7 +951,10 @@ private function processStmtNode( | |||
| ]), | |||
| ))); | |||
| } else { | |||
Contributor
Author
There was a problem hiding this comment.
I'm not sure about the purpose of
if ($this->polluteScopeWithAlwaysIterableForeach) {
$finalScope = $finalScope->mergeWith($scope->filterByTruthyValue(new BooleanOr(
new BinaryOp\Identical(
$stmt->expr,
new Array_([]),
),
new FuncCall(new Name\FullyQualified('is_object'), [
new Arg($stmt->expr),
]),
)));
} else {
$finalScope = $finalScope->mergeWith($scope);
}
But I soon as I make this change, the issue is solved.
I dunno
- if it has a bad impact (I can add tests if you had some in mind)
- if I should just remove the else part and the if condition.
Collaborator
|
This pull request has been marked as ready for review. |
ondrejmirtes
requested changes
Apr 23, 2024
ondrejmirtes
requested changes
Apr 23, 2024
| public static function getAdditionalConfigFiles(): array | ||
| { | ||
| return [ | ||
| __DIR__ . '/../../../conf/bleedingEdge.neon', |
Member
There was a problem hiding this comment.
Merging with parent would be better (I think bleedingEdge is there already)
Contributor
Author
There was a problem hiding this comment.
Parent is
/**
* @return string[]
*/
public static function getAdditionalConfigFiles(): array
{
return [];
}
Contributor
Author
There was a problem hiding this comment.
NodeScopeResolverTest use
public static function getAdditionalConfigFiles(): array
{
return [
__DIR__ . '/../../../conf/bleedingEdge.neon',
__DIR__ . '/typeAliases.neon',
];
}
I followed the same idea
Member
|
Thank you. |
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
3 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.
Closes phpstan/phpstan#10922