Merge pull request #8152 from othercorey/fix-filter-var

Fix filter_var and filter_var_array signatures
vimeo · Jun 24, 2022 · cd54574 · cd54574
2 parents 13100bb + e1e8585
commit cd54574
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -3291,8 +3291,8 @@
 'filter_input' => ['mixed|false', 'type'=>'int', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
 'filter_input_array' => ['mixed|false', 'type'=>'int', 'options='=>'int|array', 'add_empty='=>'bool'],
 'filter_list' => ['array'],
-'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'mixed'],
-'filter_var_array' => ['mixed|false', 'array'=>'array', 'options='=>'mixed', 'add_empty='=>'bool'],
+'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'array|int'],
+'filter_var_array' => ['array|false|null', 'array'=>'array', 'options='=>'array|int', 'add_empty='=>'bool'],
 'FilterIterator::__construct' => ['void', 'iterator'=>'Iterator'],
 'FilterIterator::accept' => ['bool'],
 'FilterIterator::current' => ['mixed'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -10862,8 +10862,8 @@
     'filter_input' => ['mixed|false', 'type'=>'int', 'var_name'=>'string', 'filter='=>'int', 'options='=>'array|int'],
     'filter_input_array' => ['mixed|false', 'type'=>'int', 'options='=>'int|array', 'add_empty='=>'bool'],
     'filter_list' => ['array'],
-    'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'mixed'],
-    'filter_var_array' => ['mixed|false', 'array'=>'array', 'options='=>'mixed', 'add_empty='=>'bool'],
+    'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'array|int'],
+    'filter_var_array' => ['array|false|null', 'array'=>'array', 'options='=>'array|int', 'add_empty='=>'bool'],
     'finfo::__construct' => ['void', 'options='=>'int', 'magic_file='=>'string'],
     'finfo::buffer' => ['string|false', 'string'=>'string', 'options='=>'int', 'context='=>'resource'],
     'finfo::file' => ['string|false', 'file_name'=>'string', 'options='=>'int', 'context='=>'resource'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -95,8 +95,6 @@ class InternalCallMapHandlerTest extends TestCase
         'enchant_dict_suggest',
         'enum_exists',
         'extract',
-        'filter_var',
-        'filter_var_array',
         // https://www.php.net/manual/en/function.fputcsv.php
         'fputcsv' => ['8.1'],
         'get_class_methods',