['15' => 'a'] is internally [15 => 'a']

vimeo · Mar 15, 2024 · 69aa389 · 69aa389
1 parent 4ea41cb
commit 69aa389
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/KeyedArrayComparator.php b/src/Psalm/Internal/Type/Comparator/KeyedArrayComparator.php
@@ -15,6 +15,7 @@
 
 use function array_keys;
 use function is_string;
+use function preg_match;
 
 /**
  * @internal
@@ -166,7 +167,9 @@ public static function isContainedBy(
                 $key_type_comparison = new TypeComparisonResult();
                 if (!UnionTypeComparator::isContainedBy(
                     $codebase,
-                    is_string($key) ? Type::getString($key) : Type::getInt(false, $key),
+                    is_string($key) && preg_match('/^\d+$/', $key) !== 1
+                        ? Type::getString($key)
+                        : Type::getInt(false, (int) $key),
                     $key_type,
                     false,
                     false,

diff --git a/tests/ArrayKeysTest.php b/tests/ArrayKeysTest.php
@@ -130,36 +130,36 @@ public function test(): array {
                      * @psalm-type TAlias = 123
                      */
                     class a {}
-                    
+
                     /**
                      * @psalm-import-type TAlias from a
                      * @template TKey as array-key
                      * @template TValue as array-key
                      * @template T as array<TKey, TValue>
-                     * 
+                     *
                      * @template TOrig as a|b
                      * @template TT as class-string<TOrig>
-                     * 
+                     *
                      * @template TBool as bool
                      */
                     class b {
-                        /** 
-                         * @var array<TAlias, int> 
+                        /**
+                         * @var array<TAlias, int>
                          */
                         private array $a = [123 => 123];
-                        
+
                         /** @var array<value-of<T>, int> */
                         public array $c = [];
-                        
+
                         /** @var array<key-of<T>, int> */
                         public array $d = [];
-                        
+
                         /** @var array<TT, int> */
                         public array $e = [];
-                        
+
                         /** @var array<key-of<array<int, string>>, int> */
                         private array $f = [123 => 123];
-                        
+
                         /** @var array<value-of<array<int, string>>, int> */
                         private array $g = ["test" => 123];
 
@@ -173,7 +173,7 @@ public function test(bool $v): array {
                             return $v ? ["a" => 123] : [123 => 123];
                         }
                     }
-                    
+
                     /** @var b<"testKey", "testValue", array<"testKey", "testValue">, b, class-string<b>, true> */
                     $b = new b;
                     $b->d["testKey"] = 123;
@@ -183,6 +183,19 @@ public function test(bool $v): array {
                     //$b->e["b"] = 123;
                     ',
             ],
+            'intStringKeyAsInt' => [
+                'code' => '<?php
+                    $a = ["15" => "a"];
+                    $b = ["15.7" => "a"];
+                    // since this is_numeric in PHP 8 but will not be int key
+                    $c = ["15 " => "a"];
+                    ',
+                'assertions' => [
+                    '$a===' => "array{15: 'a'}",
+                    '$b===' => "array{'15.7': 'a'}",
+                    '$c===' => "array{'15 ': 'a'}",
+                ],
+            ],
         ];
     }