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

Prevent variables named "haystack" from receiving literal strings

Browse Source 
cc @staabm
This commit is contained in:
Matthew Brown 2020-09-05 00:35:48 -04:00 committed by Daniil Gentili
parent 3912d31365
commit 274d19c649
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
5 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View File

@ -120,6 +120,23 @@ class ArgumentAnalyzer
return;
}
if ($function_param->expect_variable
&& $arg_value_type->hasLiteralString()
&& !$arg->value instanceof PhpParser\Node\Scalar
) {
if (IssueBuffer::accepts(
new InvalidArgument(
'Argument ' . ($argument_offset + 1) . ' of ' . $cased_method_id
. ' expects a non-literal value, ' . $arg_value_type->getId() . ' provided',
new CodeLocation($statements_analyzer->getSource(), $arg->value),
$cased_method_id
),
$statements_analyzer->getSuppressedIssues()
)) {
// fall through
}
}
if (self::checkFunctionLikeTypeMatches(
$statements_analyzer,
$codebase,

4
src/Psalm/Internal/Codebase/InternalCallMapHandler.php
View File

@ -307,6 +307,10 @@ class InternalCallMapHandler
$function_param->out_type = $out_type;
}
if ($arg_name === 'haystack') {
$function_param->expect_variable = true;
}
if (isset(self::$taint_sink_map[$call_map_key][$arg_offset])) {
$function_param->sinks = self::$taint_sink_map[$call_map_key][$arg_offset];
}

7
src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
View File

@ -2089,6 +2089,13 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$param_array = $this->getTranslatedFunctionParam($param, $stmt, $fake_method, $fq_classlike_name);
if ($param_array->name === 'haystack'
&& (strpos($this->file_path, 'CoreGenericFunctions.phpstub')
|| strpos($this->file_path, 'CoreGenericClasses.phpstub'))
) {
$param_array->expect_variable = true;
}
if (isset($existing_params['$' . $param_array->name])) {
$storage->docblock_issues[] = new DuplicateParam(
'Duplicate param $' . $param_array->name . ' in docblock for ' . $cased_function_id,

5
src/Psalm/Storage/FunctionLikeParameter.php
View File

@ -88,6 +88,11 @@ class FunctionLikeParameter
*/
public $type_inferred = false;
/**
* @var bool
*/
public $expect_variable = false;
/**
* @param string $name
* @param Type\Union|null $type

4
tests/ConstantTest.php
View File

@ -412,8 +412,8 @@ class ConstantTest extends TestCase
class A {
private const STRING = "x";
public static function bar() : bool {
return !defined("FOO") && strpos("x", self::STRING) === 0;
public static function bar(string $s) : bool {
return !defined("FOO") && strpos($s, self::STRING) === 0;
}
}'
],