Add list identification for late-resolved constants

Fixes #2624
vimeo · Jan 15, 2020 · d434f7f · d434f7f
1 parent 1b551b8
commit d434f7f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -1624,13 +1624,21 @@ private function resolveConstantType(
                 return new Type\Atomic\TArray([Type::getEmpty(), Type::getEmpty()]);
             }
 
+            $is_list = true;
+
             foreach ($c->entries as $i => $entry) {
                 if ($entry->key) {
                     $key_type = $this->resolveConstantType(
                         $entry->key,
                         $statements_analyzer,
                         $visited_constant_ids + [$c_id => true]
                     );
+
+                    if (!$key_type instanceof Type\Atomic\TLiteralInt
+                        || $key_type->value !== $i
+                    ) {
+                        $is_list = false;
+                    }
                 } else {
                     $key_type = new Type\Atomic\TLiteralInt($i);
                 }
@@ -1652,7 +1660,11 @@ private function resolveConstantType(
                 $properties[$key_value] = $value_type;
             }
 
-            return new Type\Atomic\ObjectLike($properties);
+            $objectlike = new Type\Atomic\ObjectLike($properties);
+
+            $objectlike->is_list = $is_list;
+
+            return $objectlike;
         }
 
         if ($c instanceof UnresolvedConstant\ClassConstant) {

diff --git a/tests/ConstantTest.php b/tests/ConstantTest.php
@@ -461,21 +461,35 @@ class Foo {
             ],
             'resolveConstArrayAsList' => [
                 '<?php
-                    class Test {
-                        public const VALUES = [
+                    class Test1 {
+                        const VALUES = [
                             "all",
                             "own"
                         ];
                     }
 
+                    class Credentials {
+                        const ALL  = "all";
+                        const OWN  = "own";
+                        const NONE = "none";
+                    }
+
+                    class Test2 {
+                        const VALUES = [
+                            Credentials::ALL,
+                            Credentials::OWN
+                        ];
+                    }
+
                     /**
                      * @psalm-param list<"all"|"own"|"mine"> $value
                      */
                     function test($value): void {
                         print_r($value);
                     }
 
-                    test(Test::VALUES);'
+                    test(Test1::VALUES);
+                    test(Test2::VALUES);'
             ],
             'resolveConstantFetchViaFunction' => [
                 '<?php