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

Fix null ref

Browse Source
This commit is contained in:
Matthew Brown 2019-01-19 16:01:43 -05:00
parent 44b51cdf8e
commit e28bf1a29b
2 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -577,9 +577,9 @@ class CommentAnalyzer
|| isset($comments['specials']['extends'])
) {
$all_inheritance = array_merge(
$comments['specials']['template-extends'] ?: [],
$comments['specials']['inherits'] ?: [],
$comments['specials']['extends'] ?: []
$comments['specials']['template-extends'] ?? [],
$comments['specials']['inherits'] ?? [],
$comments['specials']['extends'] ?? []
);
foreach ($all_inheritance as $template_line) {

50
tests/TemplateTest.php
View File

@ -1627,6 +1627,56 @@ class TemplateTest extends TestCase
'$f2' => 'Foo',
]
],
'supportBareExtends' => [
'<?php
/**
* @template T
*/
abstract class Container
{
/**
* @return T
*/
public abstract function getItem();
}
class Foo
{
}
/**
* @extends Container<Foo>
*/
class FooContainer extends Container
{
/**
* @return Foo
*/
public function getItem()
{
return new Foo();
}
}
/**
* @template TItem
* @param Container<TItem> $c
* @return TItem
*/
function getItemFromContainer(Container $c) {
return $c->getItem();
}
$fc = new FooContainer();
$f1 = $fc->getItem();
$f2 = getItemFromContainer($fc);',
[
'$fc' => 'FooContainer',
'$f1' => 'Foo',
'$f2' => 'Foo',
]
],
'allowExtendingParameterisedTypeParam' => [
'<?php
/**