Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

keep literal string for simple str_replace #8619

Merged
merged 2 commits into from Oct 27, 2022
Merged

keep literal string for simple str_replace #8619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de52e42
keep literal string for simple str_replace
kkmuffme Oct 26, 2022
e064a0c
fix unrelated CI error
kkmuffme Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/Psalm/Internal/Provider/ReturnTypeProvider/StrReplaceReturnTypeProvider.php
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
use Psalm\Type\Atomic\TString;
use Psalm\Type\Union;

use function call_user_func;
use function count;
use function in_array;

Expand Down Expand Up @@ -50,7 +51,27 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev

$return_type = Type::getString();

if (in_array($function_id, ['preg_replace', 'preg_replace_callback'], true)) {
if (in_array($function_id, ['str_replace', 'str_ireplace'], true)
&& $subject_type->isSingleStringLiteral()
) {
$first_arg = $statements_source->node_data->getType($call_args[0]->value);
$second_arg = $statements_source->node_data->getType($call_args[1]->value);
if ($first_arg
&& $second_arg && $first_arg->isSingleStringLiteral()
&& $second_arg->isSingleStringLiteral()
) {
/**
* @var string $replaced_string
*/
$replaced_string = call_user_func(
$function_id,
$first_arg->getSingleStringLiteral()->value,
$second_arg->getSingleStringLiteral()->value,
$subject_type->getSingleStringLiteral()->value
);
$return_type = Type::getString($replaced_string);
}
} elseif (in_array($function_id, ['preg_replace', 'preg_replace_callback'], true)) {
$return_type = new Union([new TString, new TNull()]);

$codebase = $statements_source->getCodebase();
Expand Down
2 changes: 2 additions & 0 deletions tests/ReturnTypeProvider/DirnameTest.php
View file
Open in desktop
Expand Up @@ -5,6 +5,8 @@
use Psalm\Tests\TestCase;
use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;

use function addslashes;

use const DIRECTORY_SEPARATOR;

class DirnameTest extends TestCase
Expand Down