Give class template context to conditional checker #2241
Merged
+114
−7
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
KmeCnin
force-pushed
the
bug8609
branch
4 times, most recently
from
a68edf9 to
f7f7f40
Compare
|
This pull request has been marked as ready for review. |
KmeCnin
force-pushed
the
bug8609
branch
2 times, most recently
from
f7f7f40 to
7c3e695
Compare
staabm
reviewed
Mar 3, 2023
| @@ -0,0 +1,34 @@ | |||
| <?php declare(strict_types = 1); | |||
|
|
|||
| namespace Generics\Bug8609; | |||
There was a problem hiding this comment.
it seems you are adding a new test-case here, but you did not analyze this file from any of the *Test classes.
you need to make sure that this file is analyzed from the correct *Test class - the one which is testing the rule which emits the error you are trying to fix
There was a problem hiding this comment.
- File name needs to be in
bug-8609.phpformat. - File needs to be analysed by tests/PHPStan/Rules/PhpDoc/MethodConditionalReturnTypeRuleTest.php.
ondrejmirtes
requested changes
Mar 8, 2023
| @@ -31,7 +31,12 @@ public function processNode(Node $node, Scope $scope): array | |||
| return []; | |||
| } | |||
|
|
|||
| return $this->helper->check($variants[0]); | |||
| $variant = $variants[0]; | |||
| $templateTypeMap = $node->getClassReflection()->getTemplateTypeMap()->union( | |||
There was a problem hiding this comment.
union isn't the best operation for this. I suggest array_merge instead, like here:
phpstan-src/src/Analyser/NameScope.php
Lines 164 to 167 in b250a8b
| @@ -0,0 +1,34 @@ | |||
| <?php declare(strict_types = 1); | |||
|
|
|||
| namespace Generics\Bug8609; | |||
There was a problem hiding this comment.
- File name needs to be in
bug-8609.phpformat. - File needs to be analysed by tests/PHPStan/Rules/PhpDoc/MethodConditionalReturnTypeRuleTest.php.
|
Finished it myself :) Thank you! |
ondrejmirtes
approved these changes
Mar 9, 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.
This PR fixes bug reported here: phpstan/phpstan#8609