infer non-falsy-string in string replace functions

phpstan · Aug 30, 2022 · 0f79dd4 · 0f79dd4
1 parent 41be802
commit 0f79dd4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Type/Php/ReplaceFunctionsDynamicReturnTypeExtension.php b/src/Type/Php/ReplaceFunctionsDynamicReturnTypeExtension.php
@@ -7,6 +7,7 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
+use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\IntersectionType;
@@ -84,6 +85,9 @@ private function getPreliminarilyResolvedTypeFromFunctionCall(
 			if (count($functionCall->getArgs()) > $replaceArgumentPosition) {
 				$replaceArgumentType = $scope->getType($functionCall->getArgs()[$replaceArgumentPosition]->value);
 
+				if ($replaceArgumentType->isNonFalsyString()->yes()) {
+					return new IntersectionType([new StringType(), new AccessoryNonFalsyStringType()]);
+				}
 				if ($replaceArgumentType->isNonEmptyString()->yes()) {
 					return new IntersectionType([new StringType(), new AccessoryNonEmptyStringType()]);
 				}

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -7344,15 +7344,15 @@ public function dataReplaceFunctions(): array
 	{
 		return [
 			[
-				'non-empty-string',
+				'non-falsy-string',
 				'$expectedString',
 			],
 			[
 				'string|null',
 				'$expectedString2',
 			],
 			[
-				'non-empty-string|null',
+				'non-falsy-string|null',
 				'$anotherExpectedString',
 			],
 			[