Merge pull request #11354 from orklah/11062

push original callable when creating callable-object in order to keep return type

Author: orklah

src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php

@@ -1698,7 +1698,7 @@ private static function reconcileArray(
                 }
             } elseif ($type instanceof TCallable) {
                 $non_array_types[] = new TCallableString();
-                $non_array_types[] = new TCallableObject();
+                $non_array_types[] = new TCallableObject($type->from_docblock, $type);
                 $redundant = false;
             } elseif ($type instanceof TIterable) {
                 if (!$type->type_params[0]->isMixed() || !$type->type_params[1]->isMixed()) {

tests/CallableTest.php

@@ -2384,6 +2384,21 @@ function f(callable $c): void {
                 f($ca);
                 PHP,
             ],
+            'callableWithoutArray' => [
+                'code' => '<?php
+                    /**
+                     * @param array|(callable():array) $var
+                     */
+                    function text($var): array
+                    {
+                        if (is_array($var)) {
+                            return $var;
+                        }
+
+                        //callable-string can\'t specify return type but it doesn\'t error
+                        return call_user_func($var);
+                    }',
+            ],
         ];
     }