non-empty-string can still contain falsy strings as individual characters

ondrejmirtes · ondrejmirtes · commit 76bd347d2281 · 2022-10-13T15:21:13.000+02:00
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -112,10 +112,6 @@ public function getOffsetValueType(Type $offsetType): Type
 			return new ErrorType();
 		}
 
-		if ((new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes()) {
-			return new IntersectionType([new StringType(), new AccessoryNonFalsyStringType()]);
-		}
-
 		return new StringType();
 	}
 
diff --git a/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php b/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php
@@ -601,4 +601,10 @@ public function testBug2851b(): void
 		$this->analyse([__DIR__ . '/data/bug-2851b.php'], []);
 	}
 
+	public function testBug8158(): void
+	{
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-8158.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-8158.php b/tests/PHPStan/Rules/Comparison/data/bug-8158.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Bug8158;
+
+function phone_number_starts_with_zero(string $phone_number): bool
+{
+	return $phone_number && $phone_number[0] === '0';
+}

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,6 @@ public function getOffsetValueType(Type $offsetType): Type`
`112`	`112`	`return new ErrorType();`
`113`	`113`	`}`
`114`	`114`
`115`		`- if ((new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes()) {`
`116`		`- return new IntersectionType([new StringType(), new AccessoryNonFalsyStringType()]);`
`117`		`- }`
`118`		`-`
`119`	`115`	`return new StringType();`
`120`	`116`	`}`
`121`	`117`
Original file line number	Diff line number	Diff line change
`@@ -601,4 +601,10 @@ public function testBug2851b(): void`
`601`	`601`	`$this->analyse([__DIR__ . '/data/bug-2851b.php'], []);`
`602`	`602`	`}`
`603`	`603`
	`604`	`+ public function testBug8158(): void`
	`605`	`+ {`
	`606`	`+ $this->checkAlwaysTrueStrictComparison = true;`
	`607`	`+ $this->analyse([__DIR__ . '/data/bug-8158.php'], []);`
	`608`	`+ }`
	`609`	`+`
`604`	`610`	`}`