Better tests

Author: janedbal

src/Type/Php/InArrayFunctionTypeSpecifyingExtension.php

@@ -111,7 +111,7 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 			|| (
 				$context->false()
 				&& count($arrayValueType->getFiniteTypes()) > 0
-				&& TypeCombinator::union(...$arrayValueType->getFiniteTypes())->equals($arrayValueType)
+				&& TypeCombinator::union(...$arrayValueType->getFiniteTypes())->equals($arrayValueType) // avoid edge-case of in_array(Enum, list<Enum>, true)
 			)
 		) {
 			$specifiedTypes = $this->typeSpecifier->create(

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -11,6 +11,7 @@
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
+use function array_filter;
 use function extension_loaded;
 use function restore_error_handler;
 use function sprintf;
@@ -1484,12 +1485,10 @@ public function testBug12083InArrayEnum(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/enum-in-array.php');
 
-		$this->assertCount(2, $errors);
+		$filteredErrors = array_filter($errors, static fn (Error $error): bool => $error->getIdentifier() !== 'function.alreadyNarrowedType'
+				&& $error->getIdentifier() !== 'function.impossibleType');
 
-		$this->assertSame('Call to function in_array() with arguments \'c\', array{\'c\'} and true will always evaluate to true.', $errors[0]->getMessage());
-		$this->assertSame(92, $errors[0]->getLine());
-		$this->assertSame('Call to function in_array() with arguments \'c\', array{\'c\'} and true will always evaluate to true.', $errors[1]->getMessage());
-		$this->assertSame(124, $errors[1]->getLine());
+		$this->assertNoErrors($filteredErrors);
 	}
 
 	/**

tests/PHPStan/Analyser/data/enum-in-array.php

@@ -58,6 +58,37 @@ public function test4(): void
 		}
 	}
 
+	public function testNegative1(): void
+	{
+		foreach (self::cases() as $enum) {
+			if (!in_array($enum, MyEnum::SET_AB, true)) {
+				assertType('MyEnum::C', $enum);
+			} else {
+				assertType('MyEnum::A|MyEnum::B', $enum);
+			}
+		}
+	}
+
+	public function testNegative2(): void
+	{
+		foreach (self::cases() as $enum) {
+			if (!in_array($enum, MyEnum::SET_AB, true)) {
+				assertType('MyEnum::C', $enum);
+			} elseif (!in_array($enum, MyEnum::SET_AB, true)) {
+				assertType('*NEVER*', $enum);
+			}
+		}
+	}
+
+	public function testNegative3(): void
+	{
+		foreach ([MyEnum::C] as $enum) {
+			if (!in_array($enum, MyEnum::SET_C, true)) {
+				assertType('*NEVER*', $enum);
+			}
+		}
+	}
+
 }
 
 class InArrayEnum
@@ -66,7 +97,7 @@ class InArrayEnum
 	/** @var list<MyEnum> */
 	private array $list = [];
 
-	public function doFoo(MyEnum $enum): void
+	public function testPositive(MyEnum $enum): void
 	{
 		if (in_array($enum, $this->list, true)) {
 			return;
@@ -75,6 +106,15 @@ public function doFoo(MyEnum $enum): void
 		assertType(MyEnum::class, $enum);
 	}
 
+	public function testNegative(MyEnum $enum): void
+	{
+		if (!in_array($enum, $this->list, true)) {
+			return;
+		}
+
+		assertType(MyEnum::class, $enum);
+	}
+
 }