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

Allow non-array docblock typehints for variadic params

Browse Source
This commit is contained in:
Matthew Brown 2017-01-17 00:26:40 -05:00
parent e4769fd04a
commit 693811abed
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Psalm/Checker/FunctionLikeChecker.php
View File

@ -978,7 +978,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
}
/**
* @param array<array{type:string,name:string,line_number:int}> $docblock_params
* @param array<int, array{type:string,name:string,line_number:int}> $docblock_params
* @param FunctionLikeStorage $storage
* @param StatementsSource $source
* @param string|null $fq_class_name
@ -999,7 +999,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
$method_id = $base . strtolower($storage->cased_name);
$cased_method_id = $base . $storage->cased_name;
foreach ($docblock_params as $docblock_param) {
foreach ($docblock_params as $i => $docblock_param) {
$param_name = $docblock_param['name'];
$line_number = $docblock_param['line_number'];
@ -1031,6 +1031,15 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
$new_param_type->from_docblock = true;
if (!$storage->param_types[$param_name]->isMixed()) {
if ($storage->params[$i]->is_variadic) {
$new_param_type = new Type\Union([
new Type\Atomic\TArray([
Type::getInt(),
$new_param_type
])
]);
}
if (!TypeChecker::isContainedBy(
$new_param_type,
$storage->param_types[$param_name],

2
tests/Php56Test.php
View File

@ -118,6 +118,7 @@ class Php56Test extends PHPUnit_Framework_TestCase
{
$stmts = self::$parser->parse('<?php
/**
* @param int $a_list
* @return array<int>
*/
function f(int ...$a_list) {
@ -151,6 +152,7 @@ class Php56Test extends PHPUnit_Framework_TestCase
{
$stmts = self::$parser->parse('<?php
/**
* @param int $a_list
* @return void
*/
function f(int ...$a_list) {