TrimFunctionDynamicReturnTypeExtension does not handle ltrim anymore

Author: ondrejmirtes

src/Type/Php/LtrimFunctionReturnTypeExtension.php

@@ -5,9 +5,13 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
+use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\ClassStringType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use PHPStan\Type\IntersectionType;
+use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use function count;
 use function ltrim;
@@ -22,11 +26,29 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): ?Type
 	{
-		if (count($functionCall->getArgs()) !== 2) {
+		if (count($functionCall->getArgs()) < 1) {
 			return null;
 		}
 
 		$string = $scope->getType($functionCall->getArgs()[0]->value);
+
+		$accessory = [];
+		$defaultType = new StringType();
+		if ($string->isLowercaseString()->yes()) {
+			$accessory[] = new AccessoryLowercaseStringType();
+		}
+		if ($string->isUppercaseString()->yes()) {
+			$accessory[] = new AccessoryUppercaseStringType();
+		}
+		if (count($accessory) > 0) {
+			$accessory[] = new StringType();
+			$defaultType = new IntersectionType($accessory);
+		}
+
+		if (count($functionCall->getArgs()) !== 2) {
+			return $defaultType;
+		}
+
 		$trimChars = $scope->getType($functionCall->getArgs()[1]->value);
 
 		if ($trimChars instanceof ConstantStringType && $trimChars->getValue() === '\\' && $string->isClassString()->yes()) {
@@ -37,7 +59,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return new ClassStringType();
 		}
 
-		return null;
+		return $defaultType;
 	}
 
 }

src/Type/Php/TrimFunctionDynamicReturnTypeExtension.php

@@ -21,7 +21,7 @@ final class TrimFunctionDynamicReturnTypeExtension implements DynamicFunctionRet
 
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool
 	{
-		return in_array($functionReflection->getName(), ['trim', 'rtrim', 'ltrim'], true);
+		return in_array($functionReflection->getName(), ['trim', 'rtrim'], true);
 	}
 
 	public function getTypeFromFunctionCall(