Enum case value null check instead of instanceof

vimeo · Aug 31, 2023 · 76f03cc · 76f03cc
1 parent f251c9c
commit 76f03cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/AtomicPropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/AtomicPropertyFetchAnalyzer.php
@@ -51,8 +51,6 @@
 use Psalm\Type\Atomic\TFalse;
 use Psalm\Type\Atomic\TGenericObject;
 use Psalm\Type\Atomic\TInt;
-use Psalm\Type\Atomic\TLiteralInt;
-use Psalm\Type\Atomic\TLiteralString;
 use Psalm\Type\Atomic\TMixed;
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TNull;
@@ -1033,13 +1031,7 @@ private static function handleEnumValue(
         $case_values = [];
 
         foreach ($enum_cases as $enum_case) {
-            if ($enum_case->value instanceof TLiteralString
-                || $enum_case->value instanceof TLiteralInt) {
-                $case_values[] = $enum_case->value;
-            } else {
-                // this should never happen
-                $case_values[] = new TMixed();
-            }
+            $case_values[] = $enum_case->value ?? new TMixed();
         }
 
         /** @psalm-suppress ArgumentTypeCoercion */

diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/GetObjectVarsReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/GetObjectVarsReturnTypeProvider.php
@@ -17,8 +17,6 @@
 use Psalm\Type\Atomic\TArray;
 use Psalm\Type\Atomic\TGenericObject;
 use Psalm\Type\Atomic\TKeyedArray;
-use Psalm\Type\Atomic\TLiteralInt;
-use Psalm\Type\Atomic\TLiteralString;
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TObjectWithProperties;
 use Psalm\Type\Union;
@@ -64,8 +62,7 @@ public static function getGetObjectVarsReturnType(
                 }
                 $enum_case_storage = $enum_classlike_storage->enum_cases[$object_type->case_name];
 
-                if ($enum_case_storage->value instanceof TLiteralString
-                    || $enum_case_storage->value instanceof TLiteralInt) {
+                if ($enum_case_storage->value !== null) {
                     $properties['value'] = new Union([$enum_case_storage->value]);
                 }