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 #684 - use getIterator return type for IteratorAggregate functions

Browse Source
This commit is contained in:
Matthew Brown 2018-04-18 23:47:21 -04:00
parent 907f741c7b
commit 392f3194c0
2 changed files with 100 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/Psalm/Checker/Statements/Block/ForeachChecker.php
View File

@ -202,6 +202,71 @@ class ForeachChecker
}
if ($codebase->classImplements(
$iterator_type->value,
'IteratorAggregate'
) ||
(
$codebase->interfaceExists($iterator_type->value)
&& $codebase->interfaceExtends(
$iterator_type->value,
'IteratorAggregate'
)
)
) {
$iterator_method = $iterator_type->value . '::getIterator';
$self_class = $iterator_type->value;
$iterator_class_type = $codebase->methods->getMethodReturnType(
$iterator_method,
$self_class
);
if ($iterator_class_type) {
$array_type = ExpressionChecker::fleshOutType(
$project_checker,
$iterator_class_type,
$self_class,
$self_class
);
foreach ($array_type->getTypes() as $array_atomic_type) {
if ($array_atomic_type instanceof Type\Atomic\TArray
|| $array_atomic_type instanceof Type\Atomic\ObjectLike
) {
if ($array_atomic_type instanceof Type\Atomic\ObjectLike) {
$array_atomic_type = $array_atomic_type->getGenericValueType();
}
$key_type_part = $array_atomic_type->type_params[0];
$value_type_part = $array_atomic_type->type_params[1];
} elseif ($array_atomic_type instanceof Type\Atomic\TGenericObject) {
$type_param_count = count($array_atomic_type->type_params);
$value_type_part = $array_atomic_type->type_params[$type_param_count - 1];
$key_type_part = $type_param_count > 1
? $array_atomic_type->type_params[0]
: Type::getMixed();
} else {
$key_type = Type::getMixed();
$value_type = Type::getMixed();
break;
}
if (!$key_type) {
$key_type = $key_type_part;
} else {
$key_type = Type::combineUnionTypes($key_type, $key_type_part);
}
if (!$value_type) {
$value_type = $value_type_part;
} else {
$value_type = Type::combineUnionTypes($value_type, $value_type_part);
}
}
} else {
$value_type = Type::getMixed();
}
} elseif ($codebase->classImplements(
$iterator_type->value,
'Iterator'
) ||

35
tests/ForeachTest.php
View File

@ -49,6 +49,41 @@ class ForeachTest extends TestCase
foreach ($object as $foo) {}
}'
],
'arrayIteratorIteration' => [
'<?php
class Item {
/**
* @var string
*/
public $prop = "var";
}
class Collection implements IteratorAggregate {
/**
* @var Item[]
*/
private $items = [];
public function add(Item $item): void
{
$this->items[] = $item;
}
/**
* @return \ArrayIterator<mixed, Item>
*/
public function getIterator(): \ArrayIterator
{
return new \ArrayIterator($this->items);
}
}
$collection = new Collection();
$collection->add(new Item());
foreach ($collection as $item) {
echo $item->prop;
}'
],
];
}