more

vimeo · Mar 22, 2024 · ed9214c · ed9214c
1 parent c1b8621
commit ed9214c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -7,6 +7,7 @@
 use Psalm\Codebase;
 use Psalm\Context;
 use Psalm\Internal\Analyzer\FunctionLikeAnalyzer;
+use Psalm\Internal\Analyzer\Statements\Expression\ArrayAnalyzer;
 use Psalm\Internal\Analyzer\Statements\Expression\Call\MethodCallAnalyzer;
 use Psalm\Internal\Analyzer\Statements\Expression\ExpressionIdentifier;
 use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
@@ -92,7 +93,6 @@
 use function implode;
 use function in_array;
 use function is_int;
-use function is_numeric;
 use function preg_match;
 use function strlen;
 use function strtolower;
@@ -1546,7 +1546,10 @@ private static function handleArrayAccessOnKeyedArray(
         if ($key_values) {
             $properties = $type->properties;
             foreach ($key_values as $key_value) {
-                if ($type->is_list && (!is_numeric($key_value->value) || $key_value->value < 0)) {
+                $string_to_int = ArrayAnalyzer::getLiteralArrayKeyInt($key_value->value);
+                $key_value = $string_to_int === false ? $key_value : new TLiteralInt($string_to_int);
+
+                if ($type->is_list && (!is_int($key_value->value) || $key_value->value < 0)) {
                     $expected_offset_types[] = $type->getGenericKeyType();
                     $has_valid_offset = false;
                 } elseif ((isset($properties[$key_value->value]) && !(

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -1475,7 +1475,7 @@ private static function getTypeFromKeyedArrayTree(
                     $property_key = $property_branch->value;
                 }
                 if ($is_list && (
-                        !is_numeric($property_key)
+                        ArrayAnalyzer::getLiteralArrayKeyInt($property_key) === false
                         || ($had_optional && !$property_maybe_undefined)
                         || $type === 'array'
                         || $type === 'callable-array'