Fix for other finite types

Author: janedbal

src/Type/Php/InArrayFunctionTypeSpecifyingExtension.php

@@ -15,14 +15,9 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
-use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
-use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeTraverser;
-use PHPStan\Type\UnionType;
 use function count;
 use function strtolower;
 
@@ -116,7 +111,7 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 			|| (
 				$context->false()
 				&& count($arrayValueType->getFiniteTypes()) > 0
-				&& $this->isEnumCasesArray($arrayValueType) // avoid eliminating all enum cases in edge case like in_array(Enum, list<Enum>, true)
+				&& TypeCombinator::union(...$arrayValueType->getFiniteTypes())->equals($arrayValueType)
 			)
 		) {
 			$specifiedTypes = $this->typeSpecifier->create(
@@ -168,23 +163,4 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 		return $specifiedTypes;
 	}
 
-	private function isEnumCasesArray(Type $type): bool
-	{
-		$containsOnlyEnumCases = true;
-
-		TypeTraverser::map($type, static function (Type $type, callable $traverse) use (&$containsOnlyEnumCases): Type {
-			if ($type instanceof UnionType || $type instanceof IntersectionType) {
-				return $traverse($type);
-			}
-
-			if (!$type instanceof EnumCaseObjectType) {
-				$containsOnlyEnumCases = false;
-			}
-
-			return $type;
-		});
-
-		return $containsOnlyEnumCases;
-	}
-
 }

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1483,7 +1483,13 @@ public function testBug11913(): void
 	public function testBug12083InArrayEnum(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/enum-in-array.php');
-		$this->assertNoErrors($errors);
+
+		$this->assertCount(2, $errors);
+
+		$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());
 	}
 
 	/**

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

@@ -15,7 +15,7 @@ enum MyEnum: string
 
 	public function test1(): void
 	{
-		foreach (MyEnum::cases() as $enum) {
+		foreach (self::cases() as $enum) {
 			if (in_array($enum, MyEnum::SET_AB, true)) {
 				assertType('MyEnum::A|MyEnum::B', $enum);
 			} elseif (in_array($enum, MyEnum::SET_C, true)) {
@@ -28,7 +28,7 @@ public function test1(): void
 
 	public function test2(): void
 	{
-		foreach (MyEnum::cases() as $enum) {
+		foreach (self::cases() as $enum) {
 			if (in_array($enum, MyEnum::SET_ABC, true)) {
 				assertType('MyEnum::A|MyEnum::B|MyEnum::C', $enum);
 			} else {
@@ -39,7 +39,7 @@ public function test2(): void
 
 	public function test3(): void
 	{
-		foreach (MyEnum::cases() as $enum) {
+		foreach (self::cases() as $enum) {
 			if (in_array($enum, MyEnum::SET_C, true)) {
 				assertType('MyEnum::C', $enum);
 			} else {
@@ -76,3 +76,56 @@ public function doFoo(MyEnum $enum): void
 	}
 
 }
+
+
+class InArrayOtherFiniteType {
+
+	const SET_AB = ['a', 'b'];
+	const SET_C = ['c'];
+	const SET_ABC = ['a', 'b', 'c'];
+
+	public function test1(): void
+	{
+		foreach (['a', 'b', 'c'] as $item) {
+			if (in_array($item, self::SET_AB, true)) {
+				assertType("'a'|'b'", $item);
+			} elseif (in_array($item, self::SET_C, true)) {
+				assertType("'c'", $item);
+			} else {
+				assertType('*NEVER*', $item);
+			}
+		}
+	}
+
+	public function test2(): void
+	{
+		foreach (['a', 'b', 'c'] as $item) {
+			if (in_array($item, self::SET_ABC, true)) {
+				assertType("'a'|'b'|'c'", $item);
+			} else {
+				assertType('*NEVER*', $item);
+			}
+		}
+	}
+
+	public function test3(): void
+	{
+		foreach (['a', 'b', 'c'] as $item) {
+			if (in_array($item, self::SET_C, true)) {
+				assertType("'c'", $item);
+			} else {
+				assertType("'a'|'b'", $item);
+			}
+		}
+	}
+	public function test4(): void
+	{
+		foreach (['c'] as $item) {
+			if (in_array($item, self::SET_C, true)) {
+				assertType("'c'", $item);
+			} else {
+				assertType('*NEVER*', $item);
+			}
+		}
+	}
+}