Fix

Author: danog

src/Psalm/Internal/Provider/ReturnTypeProvider/FilterUtils.php

@@ -19,6 +19,7 @@
 use Psalm\Type\Atomic\TArray;
 use Psalm\Type\Atomic\TArrayKey;
 use Psalm\Type\Atomic\TBool;
+use Psalm\Type\Atomic\TClosure;
 use Psalm\Type\Atomic\TFalse;
 use Psalm\Type\Atomic\TFloat;
 use Psalm\Type\Atomic\TInt;
@@ -191,7 +192,7 @@ public static function getOptionsArgValueOrError(
                     if ($filter_int_used === FILTER_CALLBACK) {
                         $only_callables = true;
                         foreach ($atomic_type->properties['options']->getAtomicTypes() as $option_atomic) {
-                            if ($option_atomic->isCallableType()) {
+                            if ($option_atomic->isCallableType() && !$option_atomic instanceof TClosure) {
                                 continue;
                             }
 

src/Psalm/Internal/Type/Comparator/CallableTypeComparator.php

@@ -53,6 +53,7 @@ public static function isContainedBy(
         if ($container_type_part instanceof TClosure) {
             if ($input_type_part->isCallableType()
                 && !$input_type_part instanceof TCallable // it has stricter checks below
+                && !$input_type_part instanceof TClosure // it has stricter checks below
             ) {
                 if ($atomic_comparison_result) {
                     $atomic_comparison_result->type_coerced = true;
@@ -62,6 +63,7 @@ public static function isContainedBy(
         }
         if ($input_type_part->isCallableType()
             && !$input_type_part instanceof TCallable // it has stricter checks below
+            && !$input_type_part instanceof TClosure // it has stricter checks below
         ) {
             return true;
         }

tests/TypeReconciliation/ReconcilerTest.php

@@ -162,7 +162,7 @@ public function providerTestReconciliation(): array
             'nullableClassStringTruthy' => ['class-string<SomeClass>', new Truthy(), 'class-string<SomeClass>|null'],
             'iterableToArray' => ['array<int, int>', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'iterable<int, int>'],
             'iterableToTraversable' => ['Traversable<int, int>', new IsType(new TNamedObject('Traversable')), 'iterable<int, int>'],
-            'callableToCallableArray' => ['callable-array{class-string|object, non-empty-string}', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable'],
+            'callableToCallableArray' => ['callable-array{0: class-string|object, 1: non-empty-string}', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable'],
             'SmallKeyedArrayAndCallable' => ['array{test: string}', new IsType(TKeyedArray::make(['test' => Type::getString()])), 'callable'],
             'BigKeyedArrayAndCallable' => ['array{foo: string, test: string, thing: string}', new IsType(TKeyedArray::make(['foo' => Type::getString(), 'test' => Type::getString(), 'thing' => Type::getString()])), 'callable'],
             'callableOrArrayToCallableArray' => ['array<array-key, mixed>', new IsType(new TArray([Type::getArrayKey(), Type::getMixed()])), 'callable|array'],