danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Add support for T of Foo

Browse Source
This commit is contained in:
Matthew Brown 2019-01-16 09:23:18 -05:00
parent 9a827c48ae
commit ee97c9dbaf
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Analyzer/CommentAnalyzer.php
View File

@ -378,7 +378,9 @@ class CommentAnalyzer
foreach ($all_templates as $template_line) { foreach ($all_templates as $template_line) {
$template_type = preg_split('/[\s]+/', $template_line); $template_type = preg_split('/[\s]+/', $template_line);
if (count($template_type) > 2 && in_array(strtolower($template_type[1]), ['as', 'super'], true)) { if (count($template_type) > 2
&& in_array(strtolower($template_type[1]), ['as', 'super', 'of'], true)
) {
$info->templates[] = [ $info->templates[] = [
$template_type[0], $template_type[0],
strtolower($template_type[1]), $template_type[2] strtolower($template_type[1]), $template_type[2]
@ -516,7 +518,9 @@ class CommentAnalyzer
foreach ($comments['specials']['template'] as $template_line) { foreach ($comments['specials']['template'] as $template_line) {
$template_type = preg_split('/[\s]+/', $template_line); $template_type = preg_split('/[\s]+/', $template_line);
if (count($template_type) > 2 && in_array(strtolower($template_type[1]), ['as', 'super'], true)) { if (count($template_type) > 2
&& in_array(strtolower($template_type[1]), ['as', 'super', 'of'], true)
) {
$info->templates[] = [ $info->templates[] = [
$template_type[0], $template_type[0],
strtolower($template_type[1]), $template_type[2] strtolower($template_type[1]), $template_type[2]

17
tests/TemplateTest.php
View File

@ -979,6 +979,23 @@ class TemplateTest extends TestCase
bar(new Foo()); bar(new Foo());
bar(new FooChild());', bar(new FooChild());',
], ],
'classTemplateOfCorrect' => [
'<?php
class Foo {}
class FooChild extends Foo {}
/**
* @template T of Foo
* @param T $x
* @return T
*/
function bar($x) {
return $x;
}
bar(new Foo());
bar(new FooChild());',
],
'classTemplateAsInterface' => [ 'classTemplateAsInterface' => [
'<?php '<?php
interface Foo {} interface Foo {}