Add resolution of generic @method tags

[mad-briller]

Attempt to close: phpstan/phpstan#6371 (comment)

This is as far as i've managed to get today on this issue; thanks to your help i've managed to forward the TemplateTags through and correctly build the template type map, but now i can't get it to resolve the return types correctly 😅

The output i'm getting from the test is:

There were 2 failures:

1) PHPStan\Analyser\NodeScopeResolverTest::testFileAsserts with data set "/home/brad.miller/code/phpstan-src/tests/PHPStan/Analyser/data/generic-method-tags.php:21" ('type', '/home/brad.miller/code/phpsta...gs.php', PHPStan\Type\Constant\ConstantStringType Object (...), PHPStan\Type\ObjectType Object (...), 21)
Expected type int, got type GenericMethodTags\TVal in /home/brad.miller/code/phpstan-src/tests/PHPStan/Analyser/data/generic-method-tags.php on line 21.
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'int'
+'GenericMethodTags\TVal'

/home/brad.miller/code/phpstan-src/src/Testing/TypeInferenceTestCase.php:102
/home/brad.miller/code/phpstan-src/tests/PHPStan/Analyser/NodeScopeResolverTest.php:1450

2) PHPStan\Analyser\NodeScopeResolverTest::testFileAsserts with data set "/home/brad.miller/code/phpstan-src/tests/PHPStan/Analyser/data/generic-method-tags.php:22" ('type', '/home/brad.miller/code/phpsta...gs.php', PHPStan\Type\Constant\ConstantStringType Object (...), PHPStan\Type\ObjectType Object (...), 22)
Expected type string, got type GenericMethodTags\TVal in /home/brad.miller/code/phpstan-src/tests/PHPStan/Analyser/data/generic-method-tags.php on line 22.
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'string'
+'GenericMethodTags\TVal'

i suspect it's because the $returnType passed to AnnotationMethodReflection is resolved with only the class-level templates and not both class and method level templates in TemplateTypeHelper::resolveTemplateTypes. resolveTemplateTypes() is returning an ObjectType() which seems incorrect, but i'm not sure what it's supposed to be to cause it to be templated properly.

To resolve this i've tried:

1. union the $classReflection->getActiveTemplateTypeMap() and my generated $templateTypeMap before passing it in to resolveTemplateTypes()
2. removed the call to TemplateTypeHelper::resolveTemplateTypes, as i suspected it may be resolving too soon?

Sorry to keep asking, but is there any further pointers you have for me? Thanks.

[ondrejmirtes]

Thi has something to do with NameScope (which contains information about what T refers to in PHPDoc) and might not be actually trivial to fix, I'll think about it 😊

[phpstan-bot]

This pull request has been marked as ready for review.

[ondrejmirtes]

I think I did it right.

[mad-briller]

ah nice! beat me to it, was just finishing breakfast and then going to take a look at this

[ondrejmirtes]

Anyway, there's a very similar feature request - to do the same thing for callables and Closures. So first we need to finish phpstan/phpdoc-parser#199 and then to a very similar PR in phpstan-src to this one.

[ondrejmirtes]

Thank you!

[staabm]

Nice!

[ondrejmirtes]

I just realized we're missing some rules about this. Basically the equivalents of these: https://phpstan.org/r/ca12c484-b4f1-4e5b-a418-3069ec569411

The best way to implement them is to create a new rule similar to https://github.com/phpstan/phpstan-src/blob/1.11.x/src/Rules/Generics/MethodTemplateTypeRule.php#L78 that also calls TemplateTypeCheck.

Do you have time to implement this? Thanks .)