Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Aug 22, 2024 · c5e0443 · c5e0443
2 parents 9e4d5b1 + 1a97440
commit c5e0443
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -316,7 +316,8 @@ public function specifyTypesInCondition(
 					$argType = $scope->getType($expr->right->getArgs()[0]->value);
 					if ($argType->isString()->yes()) {
 						$accessory = new AccessoryNonEmptyStringType();
-						if ($leftType instanceof ConstantIntegerType && $leftType->getValue() >= 2) {
+
+						if (IntegerRangeType::createAllGreaterThanOrEqualTo(2 - $offset)->isSuperTypeOf($leftType)->yes()) {
 							$accessory = new AccessoryNonFalsyStringType();
 						}
 

diff --git a/tests/PHPStan/Analyser/nsrt/bug-10952b.php b/tests/PHPStan/Analyser/nsrt/bug-10952b.php
@@ -16,13 +16,13 @@ public function test(): void
 		$string = $this->getString();
 
 		if (1 < mb_strlen($string)) {
-			assertType('non-empty-string', $string);
+			assertType('non-falsy-string', $string);
 		} else {
 			assertType("string", $string);
 		}
 
 		if (mb_strlen($string) > 1) {
-			assertType('non-empty-string', $string);
+			assertType('non-falsy-string', $string);
 		} else {
 			assertType("string", $string);
 		}

diff --git a/tests/PHPStan/Analyser/nsrt/strlen-int-range.php b/tests/PHPStan/Analyser/nsrt/strlen-int-range.php
@@ -0,0 +1,54 @@
+<?php // lint >= 7.2
+
+namespace StrlenIntRange;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param int<0, 3> $zeroToThree
+ * @param int<2, 3> $twoOrThree
+ * @param int<2, max> $twoOrMore
+ * @param int<min, 3> $maxThree
+ * @param int<10, 11> $tenOrEleven
+ */
+function doFoo(string $s, $zeroToThree, $twoOrThree, $twoOrMore, int $maxThree, $tenOrEleven): void
+{
+	if (strlen($s) >= $zeroToThree) {
+		assertType('string', $s);
+	}
+	if (strlen($s) > $zeroToThree) {
+		assertType('non-empty-string', $s);
+	}
+
+	if (strlen($s) >= $twoOrThree) {
+		assertType('non-falsy-string', $s);
+	}
+	if (strlen($s) > $twoOrThree) {
+		assertType('non-falsy-string', $s);
+	}
+
+	if (strlen($s) > $twoOrMore) {
+		assertType('non-falsy-string', $s);
+	}
+
+	$oneOrMore = $twoOrMore-1;
+	if (strlen($s) > $oneOrMore) {
+		assertType('non-falsy-string', $s);
+	}
+	if (strlen($s) >= $oneOrMore) {
+		assertType('non-empty-string', $s);
+	}
+	if (strlen($s) <= $oneOrMore) {
+		assertType('string', $s);
+	} else {
+		assertType('non-falsy-string', $s);
+	}
+
+	if (strlen($s) > $maxThree) {
+		assertType('string', $s);
+	}
+
+	if (strlen($s) > $tenOrEleven) {
+		assertType('non-falsy-string', $s);
+	}
+}