Improve loose comparison on array type

Author: staabm

src/Type/Accessory/NonEmptyArrayType.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\CompoundType;
+use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
@@ -402,6 +403,10 @@ public function isScalar(): TrinaryLogic
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
+		if ($type->isArray()->yes() && $type->isIterableAtLeastOnce()->no()) {
+			return new ConstantBooleanType(false);
+		}
+
 		return new BooleanType();
 	}
 

src/Type/ArrayType.php

@@ -249,6 +249,10 @@ public function isConstantValue(): TrinaryLogic
 
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
+		if ($type->isInteger()->yes()) {
+			return new ConstantBooleanType(false);
+		}
+
 		return new BooleanType();
 	}
 

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

@@ -701,11 +701,19 @@ public function sayConstUnion(
 	/**
 	 * @param uppercase-string $upper
 	 * @param lowercase-string $lower
+	 * @param array{} $emptyArr
+	 * @param non-empty-array $nonEmptyArr
+	 * @param int<10, 20> $intRange
 	 */
 	public function sayIntersection(
 		string $upper,
 		string $lower,
 		string $s,
+		array $emptyArr,
+		array $nonEmptyArr,
+		array $arr,
+		int $i,
+		int $intRange,
 	): void
 	{
 		assertType('bool', '' == $upper);
@@ -731,7 +739,15 @@ public function sayIntersection(
 		assertType('bool', strtoupper($s) == $lower); // should be false
 		assertType('bool', strtolower($s) == $lower);
 		assertType('bool', $lower == $upper); // should be false
-	}
 
+		assertType('false', $arr == $i);
+		assertType('false', $nonEmptyArr == $i);
+		assertType('false', $arr == $intRange);
+		assertType('false', $nonEmptyArr == $intRange);
+		assertType('bool', $emptyArr == $nonEmptyArr); // should be false
+		assertType('false', $nonEmptyArr == $emptyArr);
+		assertType('bool', $arr == $nonEmptyArr);
+		assertType('bool', $nonEmptyArr == $arr);
+	}
 
 }