Fix #3639 - allow coerced types to count when picking callmap options

vimeo · Jun 23, 2020 · 9b86021 · 9b86021
1 parent 1f86afe
commit 9b86021
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Codebase/InternalCallMapHandler.php b/src/Psalm/Internal/Codebase/InternalCallMapHandler.php
@@ -169,13 +169,16 @@ public static function getMatchingCallableFromCallMapOptions(
                     }
                 }
 
+                $arg_result = new \Psalm\Internal\Analyzer\TypeComparisonResult();
+
                 if (TypeAnalyzer::isContainedBy(
                     $codebase,
                     $arg_type,
                     $param_type,
                     true,
-                    true
-                )) {
+                    true,
+                    $arg_result
+                ) || $arg_result->type_coerced) {
                     continue;
                 }
 

diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -1174,6 +1174,21 @@ function (array $matches) : string {
                         );
                     }',
             ],
+            'pregReplaceCallbackWithArray' => [
+                '<?php
+                    /**
+                     * @param string[] $ids
+                     * @psalm-suppress MissingClosureReturnType
+                     * @psalm-suppress MixedArgumentTypeCoercion
+                     */
+                    function(array $ids): array {
+                        return \preg_replace_callback(
+                            "",
+                            fn (array $matches) => $matches[4],
+                            $ids
+                        );
+                    };'
+            ],
             'compactDefinedVariable' => [
                 '<?php
                     /**