Improve loose comparison on numeric string

Author: VincentLanglet

src/Type/Accessory/AccessoryLowercaseStringType.php

@@ -327,7 +327,11 @@ public function isScalar(): TrinaryLogic
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
-		if ($type->isString()->yes() && $type->isLowercaseString()->no()) {
+		if (
+			$type->isString()->yes()
+			&& $type->isLowercaseString()->no()
+			&& ($type->isNumericString()->no() || $this->isNumericString()->no())
+		) {
 			return new ConstantBooleanType(false);
 		}
 

src/Type/Accessory/AccessoryUppercaseStringType.php

@@ -327,7 +327,11 @@ public function isScalar(): TrinaryLogic
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
-		if ($type->isString()->yes() && $type->isUppercaseString()->no()) {
+		if (
+			$type->isString()->yes()
+			&& $type->isUppercaseString()->no()
+			&& ($type->isNumericString()->no() || $this->isNumericString()->no())
+		) {
 			return new ConstantBooleanType(false);
 		}
 

tests/PHPStan/Analyser/nsrt/loose-comparisons.php

@@ -716,11 +716,16 @@ public function sayIntersection(
 		int $intRange,
 	): void
 	{
+		// https://3v4l.org/q8OP2
+		assertType('true', '1e2' == '1E2');
+		assertType('false', '1e2' === '1E2');
+
 		assertType('bool', '' == $upper);
 		assertType('bool', '0' == $upper);
 		assertType('false', 'a' == $upper);
 		assertType('false', 'abc' == $upper);
 		assertType('false', 'aBc' == $upper);
+		assertType('bool', '1e2' == $upper);
 		assertType('bool', strtoupper($s) == $upper);
 		assertType('bool', strtolower($s) == $upper);
 		assertType('bool', $upper == $lower);
@@ -729,6 +734,7 @@ public function sayIntersection(
 		assertType('false', 'A' == $lower);
 		assertType('false', 'ABC' == $lower);
 		assertType('false', 'AbC' == $lower);
+		assertType('bool', '1E2' == $lower);
 		assertType('bool', strtoupper($s) == $lower);
 		assertType('bool', strtolower($s) == $lower);
 		assertType('bool', $lower == $upper);