Fixes

Author: danog

src/Psalm/Internal/Type/TypeTokenizer.php

@@ -56,6 +56,7 @@ final class TypeTokenizer
         'trait-string' => true,
         'callable-string' => true,
         'callable-array' => true,
+        'callable-list' => true,
         'callable-object' => true,
         'stringable-object' => true,
         'pure-callable' => true,

src/Psalm/Type/Atomic.php

@@ -264,6 +264,22 @@ private static function createInner(
                     new Union([$string]),
                 ]);
 
+            case 'callable-list':
+                $classString = new TClassString(
+                    'object',
+                    null,
+                    false,
+                    false,
+                    false,
+                    true,
+                );
+                $object = new TObject(true);
+                $string = new TNonEmptyString(true);
+                return TKeyedArray::makeCallable([
+                    new Union([$classString, $object]),
+                    new Union([$string]),
+                ], null, true);
+
             case 'list':
                 return Type::getListAtomic(Type::getMixed(false, $from_docblock));
 

tests/TypeCombinationTest.php

@@ -710,6 +710,20 @@ public function providerTestValidTypeCombination(): array
                     'callable',
                 ],
             ],
+            'combineCallableAndCallableList' => [
+                'callable',
+                [
+                    'callable',
+                    'callable-list',
+                ],
+            ],
+            'combineCallableListAndCallable' => [
+                'callable',
+                [
+                    'callable-list',
+                    'callable',
+                ],
+            ],
             'combineCallableArrayAndArray' => [
                 'array<array-key, mixed>',
                 [