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

Make sure encapsulated strings can also coerce param types

Browse Source
This commit is contained in:
Matthew Brown 2017-09-02 19:48:59 -04:00
parent a0c27cee4f
commit 11aa3558b7
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Psalm/Checker/Statements/ExpressionChecker.php
View File

@ -2013,11 +2013,58 @@ class ExpressionChecker
PhpParser\Node\Scalar\Encapsed $stmt,
Context $context
) {
$project_checker = $statements_checker->getFileChecker()->project_checker;
$function_storage = null;
if ($project_checker->infer_types_from_usage) {
$source_checker = $statements_checker->getSource();
if ($source_checker instanceof FunctionLikeChecker) {
$function_id = $source_checker->getMethodId();
if (strpos($function_id, '::')) {
$declaring_method_id = MethodChecker::getDeclaringMethodId($project_checker, $function_id);
if (!$declaring_method_id) {
throw new \UnexpectedValueException('This should never happen');
}
$function_storage = MethodChecker::getStorage($project_checker, $declaring_method_id);
} else {
$function_storage = FunctionChecker::getStorage($statements_checker, $function_id);
}
}
}
/** @var PhpParser\Node\Expr $part */
foreach ($stmt->parts as $part) {
if (self::analyze($statements_checker, $part, $context) === false) {
return false;
}
if ($function_storage
&& $function_storage->param_types
&& $part->inferredType
&& $part->inferredType->isMixed()
) {
if ($part instanceof PhpParser\Node\Expr\Variable
&& is_string($part->name)
&& !isset($context->assigned_vars['$' . $part->name])
&& array_key_exists($part->name, $function_storage->param_types)
&& !$function_storage->param_types[$part->name]
) {
if (isset($context->possible_param_types[$part->name])) {
$context->possible_param_types[$part->name] = Type::combineUnionTypes(
$context->possible_param_types[$part->name],
Type::getString()
);
} else {
$context->possible_param_types[$part->name] = Type::getString();
$context->vars_in_scope['$' . $part->name] = Type::getString();
}
}
}
}
$stmt->inferredType = Type::getString();

9
tests/AnnotationTest.php
View File

@ -399,6 +399,15 @@ class AnnotationTest extends TestCase
. ' should be string',
'error_levels' => ['MixedOperand'],
],
'noParamTypeButTemplatedString' => [
'<?php
function fooFoo($a) : void {
echo "$a";
}',
'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
. ' should be string',
'error_levels' => ['MixedOperand'],
],
'noStringIntParamType' => [
'<?php
function fooFoo($a) : void {