Fix

phpstan · Nov 27, 2023 · 0a39b42 · 0a39b42
1 parent 4c937b1
commit 0a39b42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1557,11 +1557,6 @@ parameters:
 			count: 4
 			path: src/Type/TypeCombinator.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Enum\\\\EnumCaseObjectType is error\\-prone and deprecated\\. Use Type\\:\\:getEnumCases\\(\\) instead\\.$#"
-			count: 1
-			path: src/Type/TypeCombinator.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\FloatType is error\\-prone and deprecated\\. Use Type\\:\\:isFloat\\(\\) instead\\.$#"
 			count: 1

diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -16,7 +16,6 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
-use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\TemplateBenevolentUnionType;
 use PHPStan\Type\Generic\TemplateType;
@@ -200,8 +199,10 @@ public static function union(Type ...$types): Type
 			if ($types[$i] instanceof StringType && !$types[$i] instanceof ClassStringType) {
 				$hasGenericScalarTypes[ConstantStringType::class] = true;
 			}
-			if ($types[$i] instanceof EnumCaseObjectType) {
+			$enumCases = $types[$i]->getEnumCases();
+			if (count($enumCases) === 1) {
 				$enumCaseTypes[$types[$i]->describe(VerbosityLevel::cache())] = $types[$i];
+
 				unset($types[$i]);
 				continue;
 			}