Add more accomodations for TPositiveInt

vimeo · Sep 1, 2020 · c2f492a · c2f492a
1 parent b5279cd
commit c2f492a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php b/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php
@@ -263,7 +263,11 @@ public static function isContainedBy(
             return true;
         }
 
-        if (get_class($input_type_part) === TInt::class && $container_type_part instanceof TLiteralInt) {
+        if ((get_class($input_type_part) === TInt::class && $container_type_part instanceof TLiteralInt)
+            || (get_class($input_type_part) === TPositiveInt::class
+                && $container_type_part instanceof TLiteralInt
+                && $container_type_part->value > 0)
+        ) {
             if ($atomic_comparison_result) {
                 $atomic_comparison_result->type_coerced = true;
                 $atomic_comparison_result->type_coerced_from_scalar = true;

diff --git a/tests/ArrayAccessTest.php b/tests/ArrayAccessTest.php
@@ -988,6 +988,18 @@ function bar(int $i) {
 
                     if ($foo !== null) {}'
             ],
+            'accessKnownArrayWithPositiveInt' => [
+                '<?php
+                    /** @param list<int> $arr */
+                    function foo(array $arr) : void {
+                        $o = [4, 15, 18, 21, 51];
+                        $i = 0;
+                        foreach ($arr as $a) {
+                            if ($o[$i] === $a) {}
+                            $i++;
+                        }
+                    }'
+            ],
         ];
     }