Fix loose inequality

src/Type/LooseComparisonHelper.php

@@ -9,6 +9,17 @@
 {
 
 	public static function compareConstantScalars(ConstantScalarType $leftType, ConstantScalarType $rightType, PhpVersion $phpVersion): BooleanType
+	{
+		[$leftValue, $rightValue] = self::getConstantScalarValuesForComparison($leftType, $rightType, $phpVersion);
+
+		// @phpstan-ignore equal.notAllowed
+		return new ConstantBooleanType($leftValue == $rightValue); // phpcs:ignore
+	}
+
+	/**
+	 * @return array{scalar, scalar}
+	 */
+	public static function getConstantScalarValuesForComparison(ConstantScalarType $leftType, ConstantScalarType $rightType, PhpVersion $phpVersion): array
 	{
 		if ($phpVersion->castsNumbersToStringsOnLooseComparison()) {
 			$isNumber = new UnionType([
@@ -17,34 +28,27 @@
 			]);
 
 			if ($leftType->isString()->yes() && $leftType->isNumericString()->no() && $isNumber->isSuperTypeOf($rightType)->yes()) {
-				$stringValue = (string) $rightType->getValue();
-				return new ConstantBooleanType($stringValue === $leftType->getValue());
+				return [$leftType->getValue(), (string) $rightType->getValue()];
 			}
 			if ($rightType->isString()->yes() && $rightType->isNumericString()->no() && $isNumber->isSuperTypeOf($leftType)->yes()) {
-				$stringValue = (string) $leftType->getValue();
-				return new ConstantBooleanType($stringValue === $rightType->getValue());
+				return [(string) $leftType->getValue(), $rightType->getValue()];
 			}
 		} else {
 			if ($leftType->isString()->yes() && $leftType->isNumericString()->no() && $rightType->isFloat()->yes()) {
-				$numericPart = (float) $leftType->getValue();
-				return new ConstantBooleanType($numericPart === $rightType->getValue());
+				return [(float) $leftType->getValue(), $rightType->getValue()];
 			}
 			if ($rightType->isString()->yes() && $rightType->isNumericString()->no() && $leftType->isFloat()->yes()) {
-				$numericPart = (float) $rightType->getValue();
-				return new ConstantBooleanType($numericPart === $leftType->getValue());
+				return [$leftType->getValue(), (float) $rightType->getValue()];
 			}
 			if ($leftType->isString()->yes() && $leftType->isNumericString()->no() && $rightType->isInteger()->yes()) {
-				$numericPart = (int) $leftType->getValue();
-				return new ConstantBooleanType($numericPart === $rightType->getValue());
+				return [(int) $leftType->getValue(), $rightType->getValue()];
 			}
 			if ($rightType->isString()->yes() && $rightType->isNumericString()->no() && $leftType->isInteger()->yes()) {
-				$numericPart = (int) $rightType->getValue();
-				return new ConstantBooleanType($numericPart === $leftType->getValue());
+				return [$leftType->getValue(), (int) $rightType->getValue()];
 			}
 		}
 
-		// @phpstan-ignore equal.notAllowed
-		return new ConstantBooleanType($leftType->getValue() == $rightType->getValue()); // phpcs:ignore
+		return [$leftType->getValue(), $rightType->getValue()];
 	}
 
 }

src/Type/Traits/ConstantScalarTypeTrait.php

@@ -81,7 +81,9 @@ public function equals(Type $type): bool
 	public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
-			return TrinaryLogic::createFromBoolean($this->value < $otherType->getValue());
+			[$leftValue, $rightValue] = LooseComparisonHelper::getConstantScalarValuesForComparison($this, $otherType, $phpVersion);
+
+			return TrinaryLogic::createFromBoolean($leftValue < $rightValue);
 		}
 
 		if ($otherType instanceof CompoundType) {
@@ -94,7 +96,9 @@ public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryL
 	public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
 	{
 		if ($otherType instanceof ConstantScalarType) {
-			return TrinaryLogic::createFromBoolean($this->value <= $otherType->getValue());
+			[$leftValue, $rightValue] = LooseComparisonHelper::getConstantScalarValuesForComparison($this, $otherType, $phpVersion);
+
+			return TrinaryLogic::createFromBoolean($leftValue <= $rightValue);
 		}
 
 		if ($otherType instanceof CompoundType) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1,4 +1,4 @@
 <?php declare(strict_types = 1);
 
 namespace PHPStan\Analyser;
 
@@ -25,10 +25,17 @@
 	 */
 	private static function findTestFiles(): iterable
 	{
+		yield __DIR__ . '/data/bug-11732-php74.php'; return;
 		foreach (self::findTestDataFilesFromDirectory(__DIR__ . '/nsrt') as $testFile) {
 			yield $testFile;
 		}
 
+		if (PHP_VERSION_ID < 80000) {
+			yield __DIR__ . '/data/bug-11732-php8.php';
+		} else {
+			yield __DIR__ . '/data/bug-11732-php74.php';
+		}
+
 		if (PHP_VERSION_ID < 80200 && PHP_VERSION_ID >= 80100) {
 			yield __DIR__ . '/data/enum-reflection-php81.php';
 		}

tests/PHPStan/Analyser/data/bug-11732-php74.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11732;
+
+use function PHPStan\Testing\assertType;
+
+class Foo {
+	public function testPHP74(): void
+	{
+		assertType('false', '' < 0);
+		assertType('true', '' <= 0);
+
+		assertType('false', 'foo' < 0);
+		assertType('true', 'foo' <= 0);
+
+		assertType('false', '' < 0.0);
+		assertType('true', '' <= 0.0);
+
+		assertType('false', 'foo' < 0.0);
+		assertType('true', 'foo' <= 0.0);
+
+		assertType('true', '' < 1);
+		assertType('true', '' <= 1);
+
+		assertType('true', 'foo' < 1);
+		assertType('true', 'foo' <= 1);
+
+		assertType('true', '' < 1.0);
+		assertType('true', '' <= 1.0);
+
+		assertType('true', 'foo' < 1.0);
+		assertType('true', 'foo' <= 1.0);
+	}
+}

tests/PHPStan/Analyser/data/bug-11732-php8.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11732;
+
+use function PHPStan\Testing\assertType;
+
+class Foo {
+	public function testPHP8(): void
+	{
+		assertType('true', '' < 0);
+		assertType('true', '' <= 0);
+
+		assertType('false', 'foo' < 0);
+		assertType('false', 'foo' <= 0);
+
+		assertType('true', '' < 0.0);
+		assertType('true', '' <= 0.0);
+
+		assertType('false', 'foo' < 0.0);
+		assertType('false', 'foo' <= 0.0);
+
+		assertType('true', '' < 1);
+		assertType('true', '' <= 1);
+
+		assertType('false', 'foo' < 1);
+		assertType('false', 'foo' <= 1);
+
+		assertType('true', '' < 1.0);
+		assertType('true', '' <= 1.0);
+
+		assertType('false', 'foo' < 1.0);
+		assertType('false', 'foo' <= 1.0);
+	}
+}