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 #4527 - improve interpolated string types

Browse Source
This commit is contained in:
Matt Brown 2020-11-11 00:38:26 -05:00 committed by Daniil Gentili
parent f83b6bb178
commit f3b6846c70
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php
View File

@ -18,7 +18,15 @@ class EncapsulatedStringAnalyzer
) : bool {
$stmt_type = Type::getString();
$non_empty = false;
foreach ($stmt->parts as $part) {
if ($part instanceof PhpParser\Node\Scalar\EncapsedStringPart
&& $part->value
) {
$non_empty = true;
}
if (ExpressionAnalyzer::analyze($statements_analyzer, $part, $context) === false) {
return false;
}
@ -52,6 +60,12 @@ class EncapsulatedStringAnalyzer
}
}
if ($non_empty) {
$new_type = new Type\Union([new Type\Atomic\TNonEmptyString()]);
$new_type->parent_nodes = $stmt_type->parent_nodes;
$stmt_type = $new_type;
}
$statements_analyzer->node_data->setType($stmt, $stmt_type);
return true;

14
tests/BinaryOperationTest.php
View File

@ -304,6 +304,20 @@ class BinaryOperationTest extends TestCase
if (is_int($s)) {}
}'
],
'interpolatedStringNotEmpty' => [
'<?php
/**
* @psalm-param non-empty-string $i
*/
function func($i): string
{
return $i;
}
function foo(string $a) : void {
func("asdasdasd $a");
}'
],
];
}