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 #2247 - don’t crash when yielding from class with too many template params

Browse Source
This commit is contained in:
Brown 2019-10-18 11:01:16 -04:00
parent 216f991b0c
commit dda68228f3
4 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
View File

@ -126,6 +126,7 @@ class ReturnTypeAnalyzer
$ignore_falsable_issues = false;
$inferred_return_type_parts = ReturnTypeCollector::getReturnTypes(
$codebase,
$function_stmts,
$inferred_yield_types,
$ignore_nullable_issues,

24
src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php
View File

@ -25,6 +25,7 @@ class ReturnTypeCollector
* @return list<Type\Atomic> a list of return types
*/
public static function getReturnTypes(
\Psalm\Codebase $codebase,
array $stmts,
array &$yield_types,
bool &$ignore_nullable_issues = false,
@ -81,6 +82,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
[$stmt->expr->expr],
$yield_types,
$ignore_nullable_issues,
@ -100,6 +102,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -111,6 +114,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$elseif->stmts,
$yield_types,
$ignore_nullable_issues,
@ -123,6 +127,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->else->stmts,
$yield_types,
$ignore_nullable_issues,
@ -134,6 +139,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -145,6 +151,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$catch->stmts,
$yield_types,
$ignore_nullable_issues,
@ -157,6 +164,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->finally->stmts,
$yield_types,
$ignore_nullable_issues,
@ -168,6 +176,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -178,6 +187,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -189,6 +199,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -199,6 +210,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$stmt->stmts,
$yield_types,
$ignore_nullable_issues,
@ -210,6 +222,7 @@ class ReturnTypeCollector
$return_types = array_merge(
$return_types,
self::getReturnTypes(
$codebase,
$case->stmts,
$yield_types,
$ignore_nullable_issues,
@ -234,7 +247,16 @@ class ReturnTypeCollector
if ($type instanceof Type\Atomic\TArray
|| $type instanceof Type\Atomic\TIterable
|| $type instanceof Type\Atomic\TGenericObject
|| ($type instanceof Type\Atomic\TGenericObject
&& ($codebase->classImplements(
$type->value,
'Iterator'
)
|| $codebase->classImplements(
$type->value,
'IteratorAggregate'
)
|| $type->value === 'Generator'))
) {
switch (count($type->type_params)) {
case 1:

1
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -540,6 +540,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer implements Statements
$ignore_falsable_issues = false;
$closure_return_types = ReturnTypeCollector::getReturnTypes(
$codebase,
$this->function->stmts,
$closure_yield_types,
$ignore_nullable_issues,

25
tests/Template/ClassTemplateTest.php
View File

@ -1805,6 +1805,31 @@ class ClassTemplateTest extends TestCase
function client($value): void {}
client(value("awdawd"));'
],
'yieldFromGenericObjectNotExtendingIterator' => [
'<?php
class Foo{}
class A {
/**
* @var Foo<string>
*/
public Foo $vector;
/**
* @param Foo<string> $v
*/
public function __construct(Foo $v) {
$this->vector = $v;
}
public function getIterator(): Iterator
{
yield from $this->vector;
}
}',
[],
['TooManyTemplateParams']
],
];
}