Skip to content

Fix strtr inferences #4466

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

Merged
VincentLanglet merged 6 commits into from
Feb 10, 2026
+69 −1
Merged

Fix strtr inferences #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c13591d
Fix strtr inferences
VincentLanglet Oct 21, 2025
50bdf16
Add assertion
VincentLanglet Oct 21, 2025
0a69e76
Improve maybe inferences
VincentLanglet Dec 5, 2025
52fa18c
Fix cs
VincentLanglet Dec 5, 2025
b80c847
Try
VincentLanglet Dec 5, 2025
de36dc2
Add tests
VincentLanglet Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Type/Php/ReplaceFunctionsDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ private function getPreliminarilyResolvedTypeFromFunctionCall(
if ($replaceArgumentType->isArray()->yes()) {
$replaceArgumentType = $replaceArgumentType->getIterableValueType();
}
} elseif ($functionReflection->getName() === 'strtr' && isset($functionCall->getArgs()[1])) {
// `strtr` has two signatures: `strtr($string1, $string2, $string3)` and `strtr($string1, $array)`
$secondArgumentType = TypeCombinator::intersect(
new ArrayType(new MixedType(), new MixedType()),
$scope->getType($functionCall->getArgs()[1]->value),
);
$replaceArgumentType = $secondArgumentType->getIterableValueType();
}
}

Expand Down
30 changes: 29 additions & 1 deletion tests/PHPStan/Analyser/nsrt/strtr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
/**
* @param non-empty-string $nonEmptyString
* @param non-falsy-string $nonFalseyString
* @param mixed $mixed
*/
function doFoo(string $s, $nonEmptyString, $nonFalseyString) {
function doFoo(string $s, $nonEmptyString, $nonFalseyString, $mixed) {
assertType('string', strtr($s, 'f', 'b'));
assertType('string', strtr($s, ['f' => 'b']));
assertType('string', strtr($s, ['f' => 'b', 'o' => 'a']));
Expand All @@ -24,4 +25,31 @@ function doFoo(string $s, $nonEmptyString, $nonFalseyString) {
assertType('non-empty-string', strtr($nonFalseyString, $s, $nonEmptyString));
assertType('non-falsy-string', strtr($nonFalseyString, $nonEmptyString, $nonFalseyString));
assertType('non-falsy-string', strtr($nonFalseyString, $nonFalseyString, $nonFalseyString));

assertType('string', strtr($s, [$s => $nonEmptyString]));
assertType('string', strtr($s, [$nonEmptyString => $nonEmptyString]));
assertType('string', strtr($s, [$nonFalseyString => $nonFalseyString]));

assertType('non-empty-string', strtr($nonEmptyString, [$s => $nonEmptyString]));
assertType('non-empty-string', strtr($nonEmptyString, [$nonEmptyString => $nonEmptyString]));
assertType('non-empty-string', strtr($nonEmptyString, [$nonFalseyString => $nonFalseyString]));

assertType('non-empty-string', strtr($nonFalseyString, [$s => $nonEmptyString]));
assertType('non-falsy-string', strtr($nonFalseyString, [$nonEmptyString => $nonFalseyString]));
assertType('non-falsy-string', strtr($nonFalseyString, [$nonFalseyString => $nonFalseyString]));
Copy link
Contributor

@staabm staabm Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assertType('non-falsy-string', strtr($nonFalseyString, [$nonFalseyString => $nonFalseyString]));
assertType('non-falsy-string', strtr($nonFalseyString, [$nonFalseyString => $nonFalseyString]));
// see https://3v4l.org/jCUhW/rfc#vgit.master
assertType('string', strtr($nonFalseyString, [$nonFalseyString => $s]));
assertType('string', strtr($nonEmptyString, [$nonEmptyString => $s]));

Copy link
Contributor Author

@VincentLanglet VincentLanglet Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


// see https://3v4l.org/jCUhW/rfc#vgit.master
assertType('string', strtr($nonFalseyString, [$nonFalseyString => $s]));
assertType('string', strtr($nonEmptyString, [$nonEmptyString => $s]));

assertType('non-empty-string', strtr($nonEmptyString, rand(0, 1) ? [$s => $nonEmptyString] : null));
assertType('non-empty-string', strtr($nonEmptyString, rand(0, 1) ? [$nonEmptyString => $nonEmptyString] : null));
assertType('non-empty-string', strtr($nonEmptyString, rand(0, 1) ? [$nonFalseyString => $nonFalseyString] : null));

assertType('non-empty-string', strtr($nonFalseyString, rand(0, 1) ? [$s => $nonEmptyString] : null));
assertType('non-falsy-string', strtr($nonFalseyString, rand(0, 1) ? [$nonEmptyString => $nonFalseyString] : null));
assertType('non-falsy-string', strtr($nonFalseyString, rand(0, 1) ? [$nonFalseyString => $nonFalseyString] : null));

assertType('string', strtr($nonEmptyString, $mixed));
assertType('string', strtr($nonFalseyString, $mixed));
}
10 changes: 10 additions & 0 deletions tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3664,6 +3664,16 @@ public function testBug5642(): void
]);
}

public function testBug13708(): void
{
$this->checkThisOnly = false;
$this->checkNullables = false;
$this->checkUnionTypes = true;
$this->checkExplicitMixed = false;

$this->analyse([__DIR__ . '/data/bug-13708.php'], []);
}

public function testBug3396(): void
{
$this->checkThisOnly = false;
Expand Down
23 changes: 23 additions & 0 deletions tests/PHPStan/Rules/Methods/data/bug-13708.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types = 1);

namespace Bug13708;

class HelloWorld
{
/**
* @param non-empty-string $s
*/
public function takeNonEmpty(string $s): void
{
return;
}

public function doStuff(): void
{
$this->takeNonEmpty(
strtr('change {me}', ['{me}' => 'me'])
);
}
}
Loading