danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #217 - bad param count for DateTimeImmutable::getTimezone

Browse Source
This commit is contained in:
Matt Brown 2017-09-21 15:36:26 -04:00
parent 6f911c7386
commit 3bc497b18e
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/CallMap.php
View File

@ -1126,7 +1126,7 @@ return [
'DateTime::getLastErrors' => ['array'],
'DateTime::getOffset' => ['int'],
'DateTime::getTimestamp' => ['int'],
'DateTime::getTimezone' => ['DateTimeZone', 'object='=>'DateTime'],
'DateTime::getTimezone' => ['DateTimeZone'],
'DateTimeImmutable::add' => ['DateTimeImmutable', 'interval'=>'DateInterval'],
'DateTimeImmutable::__construct' => ['DateTimeImmutable', 'time='=>'string', 'timezone='=>'DateTimeZone'],
'DateTimeImmutable::createFromFormat' => ['DateTimeImmutable', 'format'=>'string', 'time'=>'string', 'timezone='=>'DateTimeZone'],

3
src/Psalm/Storage/FunctionLikeStorage.php
View File

@ -101,4 +101,7 @@ class FunctionLikeStorage
* @var array<string, array<int, CodeLocation>>|null
*/
public $referencing_locations;
/** @var array<string, string|int> */
public $assertions = [];
}

41
src/Psalm/Visitor/DependencyFinderVisitor.php
View File

@ -559,6 +559,7 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
$has_optional_param = false;
$existing_params = [];
$param_name_map
/** @var PhpParser\Node\Param $param */
foreach ($stmt->getParams() as $param) {
@ -575,7 +576,7 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
}
}
$existing_params[$param_array->name] = true;
$existing_params[$param_array->name] = $i;
$storage->param_types[$param_array->name] = $param_array->type;
$storage->params[] = $param_array;
@ -602,6 +603,44 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
$storage->required_param_count = $required_param_count;
if (strpos($stmt->name, 'assert') === 0) {
$var_assertions = [];
foreach ($stmt->stmts as $function_stmt) {
if ($function_stmt instanceof PhpParser\Node\Stmt\If_
&& $function_stmt->stmts[0] instanceof PhpParser\Node\Stmt\Throw_
) {
$conditional = $function_stmt->cond;
if ($conditional instanceof PhpParser\Node\Expr\BooleanNot
&& $conditional->expr instanceof PhpParser\Node\Expr\Instanceof_
&& $conditional->expr->expr instanceof PhpParser\Node\Expr\Variable
&& is_string($conditional->expr->expr->name)
&& isset($existing_params[$conditional->expr->expr->name])
) {
$param_offset = $existing_params[$conditional->expr->expr->name];
if ($conditional->expr->class instanceof PhpParser\Node\Expr\Variable
&& is_string($conditional->expr->class->name)
&& isset($existing_params[$conditional->expr->class->name])
) {
$var_assertions[$param_offset]
= $existing_params[$conditional->expr->class->name];
} elseif ($conditional->expr->class instanceof PhpParser\Node\Name) {
$instanceof_class = ClassLikeChecker::getFQCLNFromNameObject(
$conditional->expr->class,
$this->aliases
);
$var_assertions[$param_offset] = $instanceof_class;
}
}
}
}
$storage->assertions = $var_assertions;
}
if ($parser_return_type = $stmt->getReturnType()) {
$suffix = '';