Fix array_filter callback type

Fix #9068
vimeo · Nov 18, 2023 · f3e9263 · staabm · Dec 23, 2023 · kkmuffme
1 parent 44a0d4c
commit f3e9263
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -371,7 +371,7 @@
 'array_diff_ukey\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
 'array_fill' => ['array<int,mixed>', 'start_index'=>'int', 'count'=>'int', 'value'=>'mixed'],
 'array_fill_keys' => ['array', 'keys'=>'array', 'value'=>'mixed'],
-'array_filter' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
+'array_filter' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,array-key=):mixed|null', 'mode='=>'int'],
 'array_flip' => ['array<string|int>', 'array'=>'array<string|int>'],
 'array_intersect' => ['array', 'array'=>'array', '...arrays='=>'array'],
 'array_intersect_assoc' => ['array', 'array'=>'array', '...arrays='=>'array'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -553,8 +553,8 @@
       'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_filter' => [
-      'old' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar', 'mode='=>'int'],
-      'new' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
+      'old' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,array-key=):mixed', 'mode='=>'int'],
+      'new' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,array-key=):mixed|null', 'mode='=>'int'],
     ],
     'array_key_exists' => [
       'old' => ['bool', 'key'=>'string|int', 'array'=>'array|object'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -9288,7 +9288,7 @@
     'array_diff_ukey\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
     'array_fill' => ['array<int,mixed>', 'start_index'=>'int', 'count'=>'int', 'value'=>'mixed'],
     'array_fill_keys' => ['array', 'keys'=>'array', 'value'=>'mixed'],
-    'array_filter' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar', 'mode='=>'int'],
+    'array_filter' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,array-key=):mixed', 'mode='=>'int'],
     'array_flip' => ['array<string|int>', 'array'=>'array<string|int>'],
     'array_intersect' => ['array', 'array'=>'array', '...arrays'=>'array'],
     'array_intersect_assoc' => ['array', 'array'=>'array', '...arrays'=>'array'],

diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -29,6 +29,18 @@ function(?int $i): bool {
                     '$e' => 'array<string, int<0, 10>|null>',
                 ],
             ],
+            'arrayFilterObject' => [
+                'code' => '<?php
+                    $e = array_filter(
+                        [(object) [], null],
+                        function($i) {
+                            return $i;
+                        }
+                    );',
+                'assertions' => [
+                    '$e' => 'array<int<0, 1>, object>',
+                ],
+            ],
             'positiveIntArrayFilter' => [
                 'code' => '<?php
                     /**