Narrow l/r/trim() arg on comparison to ''

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -1303,6 +1303,26 @@ private function specifyTypesForConstantStringBinaryExpression(
 			)->setRootExpr($rootExpr);
 		}
 
+		if (
+			$context->false()
+			&& $exprNode instanceof FuncCall
+			&& $exprNode->name instanceof Name
+			&& in_array(strtolower((string) $exprNode->name), ['trim', 'ltrim', 'rtrim'], true)
+			&& isset($exprNode->getArgs()[0])
+			&& $constantStringValue === ''
+		) {
+			$argType = $scope->getType($exprNode->getArgs()[0]->value);
+
+			if ($argType->isString()->yes()) {
+				return $this->create(
+					$exprNode->getArgs()[0]->value,
+					new AccessoryNonEmptyStringType(),
+					$context->negate(),
+					$scope,
+				)->setRootExpr($rootExpr);
+			}
+		}
+
 		return null;
 	}
 

tests/PHPStan/Analyser/nsrt/bug-12973.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Bug12973;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @return non-empty-string|null
+ */
+function nullIfBlank(?string $value): ?string
+{
+	if ($value !== null) {
+		return \trim($value) === '' ? null : $value;
+	}
+
+	return null;
+}
+
+function trimTypes(string $value): void
+{
+	if (trim($value) === '') {
+		assertType('string', $value);
+	} else {
+		assertType('non-empty-string', $value);
+	}
+	assertType('string', $value);
+
+	if (trim($value) !== '') {
+		assertType('non-empty-string', $value);
+	} else {
+		assertType('string', $value);
+	}
+	assertType('string', $value);
+}
+
+function ltrimTypes(string $value): void
+{
+	if (ltrim($value) === '') {
+		assertType('string', $value);
+	} else {
+		assertType('non-empty-string', $value);
+	}
+	assertType('string', $value);
+
+	if (ltrim($value) !== '') {
+		assertType('non-empty-string', $value);
+	} else {
+		assertType('string', $value);
+	}
+	assertType('string', $value);
+}
+
+function rtrimTypes(string $value): void
+{
+	if (rtrim($value) === '') {
+		assertType('string', $value);
+	} else {
+		assertType('non-empty-string', $value);
+	}
+	assertType('string', $value);
+
+	if (rtrim($value) !== '') {
+		assertType('non-empty-string', $value);
+	} else {
+		assertType('string', $value);
+	}
+	assertType('string', $value);
+}

tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php

@@ -378,4 +378,11 @@ public function testBug9401(): void
 		]);
 	}
 
+	public function testBug12973(): void
+	{
+		$this->checkNullables = true;
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-12973.php'], []);
+	}
+
 }