Merge pull request #10454 from kkmuffme/unsealed-not-nonempty-callabl…

…e-param-should-be-valid fix false positive ArgumentTypeCoercion for callback param
vimeo · Dec 12, 2023 · 1df5b35 · 1df5b35
2 parents a5e1579 + 3c045b3
commit 1df5b35
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/ArrayTypeComparator.php b/src/Psalm/Internal/Type/Comparator/ArrayTypeComparator.php
@@ -49,6 +49,19 @@ public static function isContainedBy(
             return true;
         }
 
+        if ($container_type_part instanceof TKeyedArray
+            && $input_type_part instanceof TArray
+            && !$container_type_part->is_list
+            && !$container_type_part->isNonEmpty()
+            && !$container_type_part->isSealed()
+            && $input_type_part->equals(
+                $container_type_part->getGenericArrayType($container_type_part->isNonEmpty()),
+                false,
+            )
+        ) {
+            return true;
+        }
+
         if ($container_type_part instanceof TKeyedArray
             && $input_type_part instanceof TArray
         ) {

diff --git a/tests/CallableTest.php b/tests/CallableTest.php
@@ -1892,6 +1892,22 @@ function addHandler(string $_message, callable $_handler): void {}
                         return [1, 2, 3];
                     });',
             ],
+            'unsealedAllOptionalCbParam' => [
+                'code' => '<?php
+                    /**
+                     * @param callable(array<string, string>) $arg
+                     * @return void
+                     */
+                    function foo($arg) {}
+
+                    /**
+                     * @param array{a?: string}&array<string, string> $cb_arg
+                     * @return void
+                     */
+                    function bar($cb_arg) {}
+
+                    foo("bar");',
+            ],
         ];
     }