Merge pull request #10312 from trusting-thompson/named-param-out

fix @param-out with named arguments
vimeo · Oct 24, 2023 · ff5526d · ff5526d
2 parents c7d7b48 + a375f44
commit ff5526d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
@@ -51,6 +51,7 @@
 use UnexpectedValueException;
 
 use function array_map;
+use function array_reduce;
 use function array_reverse;
 use function array_slice;
 use function array_values;
@@ -1031,7 +1032,26 @@ private static function handlePossiblyMatchingByRefParam(
             $check_null_ref = true;
 
             if ($last_param) {
-                if ($argument_offset < count($function_params)) {
+                if ($arg->name !== null) {
+                    $function_param = array_reduce(
+                        $function_params,
+                        static function (
+                            ?FunctionLikeParameter $function_param,
+                            FunctionLikeParameter $param
+                        ) use (
+                            $arg
+                        ) {
+                            if ($param->name === $arg->name->name) {
+                                return $param;
+                            }
+                            return $function_param;
+                        },
+                        null,
+                    );
+                    if ($function_param === null) {
+                        return false;
+                    }
+                } elseif ($argument_offset < count($function_params)) {
                     $function_param = $function_params[$argument_offset];
                 } else {
                     $function_param = $last_param;

diff --git a/tests/ReferenceConstraintTest.php b/tests/ReferenceConstraintTest.php
@@ -193,6 +193,24 @@ function takesNullableObj(?A &$a): bool { return true; }
 
                     if ($a) {}',
             ],
+            'PHP80-paramOutChangeTypeWithNamedArgument' => [
+                'code' => '<?php
+                    /**
+                     * @param-out int $s
+                     */
+                    function addFoo(bool $five = true, ?string &$s = null) : void {
+                        if ($five) {
+                            $s = 5;
+                            return;
+                        }
+                        $s = 4;
+                    }
+
+                    addFoo(s: $a);',
+                'assertions' => [
+                    '$a' => 'int',
+                ],
+            ],
         ];
     }