Prevent infinite loop in case a TClassConstant is expanded to itself (#…

…5951)
vimeo · Jun 18, 2021 · 3c9476b · 3c9476b
1 parent 79478a6
commit 3c9476b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -2076,11 +2076,13 @@ private static function checkArrayOffsetType(
                 );
 
                 if ($expanded instanceof Atomic) {
-                    $has_valid_absolute_offset = self::checkArrayOffsetType(
-                        $offset_type,
-                        [$expanded],
-                        $codebase
-                    );
+                    if (!$expanded instanceof Atomic\TClassConstant) {
+                        $has_valid_absolute_offset = self::checkArrayOffsetType(
+                            $offset_type,
+                            [$expanded],
+                            $codebase
+                        );
+                    }
                 } else {
                     $has_valid_absolute_offset = self::checkArrayOffsetType(
                         $offset_type,

diff --git a/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php b/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php
@@ -81,12 +81,14 @@ public static function isContainedBy(
                 );
 
                 if ($expanded instanceof Atomic) {
-                    $input_atomic_types[] = $expanded;
+                    if (!$expanded instanceof Atomic\TClassConstant) {
+                        $input_atomic_types[] = $expanded;
+                        continue;
+                    }
                 } else {
                     $input_atomic_types = array_merge($expanded, $input_atomic_types);
+                    continue;
                 }
-
-                continue;
             }
 
             $type_match_found = false;