Generic functions reflection and integration #2219
Conversation
src/Type/FileTypeMapper.php
Outdated
| @@ -232,10 +233,12 @@ function (\PhpParser\Node $node) use ($fileName, $lookForTrait, &$phpDocMap, &$c | |||
| $uses[strtolower($use->getAlias()->name)] = sprintf('%s\\%s', $prefix, (string) $use->name); | |||
| } | |||
| return null; | |||
| } elseif ($node instanceof Node\Stmt\ClassMethod) { | |||
| $functionName = ltrim(sprintf('%s\\%s', $namespace, $node->name->name), '\\'); | |||
There was a problem hiding this comment.
This doesn't seem right. Let's say we have class Bar in namespace Foo with method baz. This will produce Foo\baz...
| foreach ($phpDocNode->getTemplateTagValues() as $tagValue) { | ||
| $resolved[$tagValue->name] = new TemplateTag( | ||
| $tagValue->name, | ||
| $this->typeNodeResolver->resolve($tagValue->bound, $nameScope) |
There was a problem hiding this comment.
What does the $tagValue->bound contain if we have @template T without any bound in the phpDoc?
There was a problem hiding this comment.
It always contains a TypeNode. @JanTvrdik suggested that it should be null in this case; I will make this change later.
| @@ -5,12 +5,10 @@ | |||
| /** | |||
| * @param array<int, int, int> $arrayWithTooManyArgs | |||
| * @param iterable<int, int, int> $iterableWithTooManyArgs | |||
| * @param \Foo<int> $genericFoo | |||
There was a problem hiding this comment.
I think this should still fail in this PR, there's no GenericObjectType implementation yet...
| @@ -15,13 +15,9 @@ protected function getRule(): Rule | |||
| public function testRule(): void | |||
| { | |||
| $this->analyse([__DIR__ . '/data/incompatible-property-phpdoc.php'], [ | |||
| [ | |||
| 'PHPDoc tag @var for property InvalidPhpDoc\FooWithProperty::$foo contains unresolvable type.', | |||
There was a problem hiding this comment.
ditto, this should still fail
| $typeString = $valueType->describe(VerbosityLevel::precise()); | ||
| if ($constant->getValue() !== $typeString) { | ||
| return [sprintf( | ||
| 'Expected type %s, got %s', |
There was a problem hiding this comment.
I don't think this rule is a good fit inside this PR. There's a similar proposal here (#2102) but I unfortunately haven't had time to look at it. Everything around asserting types should be done in NodeScopeResolverTest until we have a better complex approach in master. For example look at dataBinary/testBinary methods in NodeScopeResolverTest to get an idea how it works. Please add any type assertions in new dataGenerics/testGenerics pair there, thank you.
There was a problem hiding this comment.
You can either have a single assertion point at die; or you can specify your own assertion points like it's in testForeachLoopVariables.
arnaud-lb
force-pushed
the
template-reflection
branch
from
b89ce16
to
b2bdb38
Compare
arnaud-lb
force-pushed
the
template-reflection
branch
from
b2bdb38
to
6c9d274
Compare
World's simplest code-based type resolver tests!
This adds reflection support for @template (integrates the phpdoc parser's result with the rest), and adds integration tests.
NameScopenow takes aTemplateTypeMap, such thatPhpDocNodeResolver/TypeNodeResolvercan properly resolve references to template types (for example,@return array<T>is resolved asArrayType(MixedType, TemplateType(T))).In integration tests, I felt the need to assert the static type of some expressions, so I added a
assertType()function and aAssertTypeRulerule (in tests only).With this PR, we can actually start to use generic functions \o/ There are some caveats, however: