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

Fix #1282 - allow generic self and static

Browse Source
This commit is contained in:
Matthew Brown 2019-02-05 08:02:06 -05:00
parent 6033345694
commit 6d5c995458
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Psalm/Type.php
View File

@ -259,7 +259,10 @@ abstract class Type
return new TClassString($class_name, $param_union_types[0]);
}
if (isset(self::PSALM_RESERVED_WORDS[$generic_type_value])) {
if (isset(self::PSALM_RESERVED_WORDS[$generic_type_value])
&& $generic_type_value !== 'self'
&& $generic_type_value !== 'static'
) {
throw new TypeParseTreeException('Cannot create generic object with reserved word');
}

45
tests/Template/TemplateExtendsTest.php
View File

@ -1090,6 +1090,51 @@ class TemplateExtendsTest extends TestCase
}
}'
],
'genericStaticAndSelf' => [
'<?php
/**
* @template T
*/
interface Functor
{
/**
* @template U
*
* @param Closure(T):U $c
*
* @return static<U>
*/
public function map(Closure $c);
}
/**
* @template T
*/
class Box implements Functor
{
/**
* @var T
*/
public $value;
/**
* @param T $x
*/
public function __construct($x)
{
$this->value = $x;
}
/**
* @template U
*
* @param Closure(T):U $c
*
* @return self<U>
*/
public function map(Closure $c)
{
return new Box($c($this->value));
}
}',
],
];
}