Bind lower bounds to upper bounds as well when no upper bound can be …

…inferred Ref vimeo#4485
danog · Jan 29, 2021 · fb5ee1e · fb5ee1e
1 parent e624f97
commit fb5ee1e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -307,17 +307,24 @@ private static function checkFunctionLikeTypeMatches(
                     $template_result->upper_bounds
                         [$template_type->param_name]
                         [$template_type->defining_class]
-                )
-                    && !isset(
+                )) {
+                    if (isset(
                         $template_result->lower_bounds
-                        [$template_type->param_name]
-                        [$template_type->defining_class]
-                    )
-                ) {
-                    $template_result->upper_bounds[$template_type->param_name][$template_type->defining_class] = [
-                        clone $template_type->as,
-                        0
-                    ];
+                            [$template_type->param_name]
+                            [$template_type->defining_class]
+                    )) {
+                        $template_result->upper_bounds[$template_type->param_name][$template_type->defining_class] = [
+                            clone $template_result->lower_bounds
+                                [$template_type->param_name]
+                                [$template_type->defining_class][0],
+                            0
+                        ];
+                    } else {
+                        $template_result->upper_bounds[$template_type->param_name][$template_type->defining_class] = [
+                            clone $template_type->as,
+                            0
+                        ];
+                    }
                 }
             }
         }

diff --git a/tests/Template/FunctionTemplateTest.php b/tests/Template/FunctionTemplateTest.php
@@ -1421,6 +1421,29 @@ function($_k, $v) { return (bool) $v; };
                         })();
                     }'
             ],
+            'allowClosureParamLowerBoundAndUpperBound' => [
+                '<?php
+                    class Foo {}
+
+                    /**
+                     * @template TParam as Foo
+                     * @psalm-param Closure(TParam): void $func
+                     * @psalm-return Closure(TParam): TParam
+                     */
+                    function takesClosure(callable $func): callable {
+                        return
+                            /**
+                             * @psalm-param TParam $value
+                             * @psalm-return TParam
+                             */
+                            function ($value) use ($func) {
+                                $func($value);
+                                return $value;
+                            };
+                    }
+
+                    $value = takesClosure(function(Foo $foo) : void {})(new Foo());'
+            ],
         ];
     }