Fix class functions CallMap signatures

vimeo · Jul 5, 2022 · e0ebfe1 · e0ebfe1
1 parent 2469b62
commit e0ebfe1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -2520,7 +2520,7 @@
 'enchant_dict_store_replacement' => ['void', 'dictionary'=>'resource', 'misspelled'=>'string', 'correct'=>'string'],
 'enchant_dict_suggest' => ['array', 'dictionary'=>'resource', 'word'=>'string'],
 'end' => ['mixed|false', '&r_array'=>'array|object'],
-'enum_exists' => ['bool', 'class' => 'class-string', 'autoload=' => 'bool'],
+'enum_exists' => ['bool', 'enum' => 'class-string', 'autoload=' => 'bool'],
 'Error::__clone' => ['void'],
 'Error::__construct' => ['void', 'message='=>'string', 'code='=>'int', 'previous='=>'?Throwable|?Error'],
 'Error::__toString' => ['string'],
@@ -3723,7 +3723,7 @@
 'get_called_class' => ['class-string'],
 'get_cfg_var' => ['string|false', 'option'=>'string'],
 'get_class' => ['class-string', 'object='=>'object'],
-'get_class_methods' => ['list<string>|null', 'object_or_class'=>'mixed'],
+'get_class_methods' => ['list<string>', 'object_or_class'=>'object|class-string'],
 'get_class_vars' => ['array<string,mixed>', 'class'=>'string'],
 'get_current_user' => ['string'],
 'get_debug_type' => ['string', 'value'=>'mixed'],
@@ -3743,7 +3743,7 @@
 'get_magic_quotes_runtime' => ['int|false'],
 'get_meta_tags' => ['array', 'filename'=>'string', 'use_include_path='=>'bool'],
 'get_object_vars' => ['array<string,mixed>', 'object'=>'object'],
-'get_parent_class' => ['class-string|false', 'object_or_class='=>'mixed'],
+'get_parent_class' => ['class-string|false', 'object_or_class='=>'object|class-string'],
 'get_required_files' => ['list<string>'],
 'get_resource_id' => ['int', 'resource'=>'resource'],
 'get_resource_type' => ['string', 'resource'=>'resource'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -357,6 +357,14 @@
       'old' => ['list<string>|false', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'],
       'new' => ['list<string>', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'],
     ],
+    'get_class_methods' => [
+        'old' => ['list<string>|null', 'object_or_class'=>'mixed'],
+        'new' => ['list<string>', 'object_or_class'=>'object|class-string'],
+    ],
+    'get_parent_class' => [
+        'old' => ['class-string|false', 'object_or_class='=>'mixed'],
+        'new' => ['class-string|false', 'object_or_class='=>'object|class-string'],
+    ],
     'gmdate' => [
       'old' => ['string', 'format'=>'string', 'timestamp='=>'int'],
       'new' => ['string', 'format'=>'string', 'timestamp='=>'int|null'],

diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
@@ -17,7 +17,7 @@
 return [
   'added' => [
     'array_is_list' => ['bool', 'array' => 'array'],
-    'enum_exists' => ['bool', 'class' => 'class-string', 'autoload=' => 'bool'],
+    'enum_exists' => ['bool', 'enum' => 'class-string', 'autoload=' => 'bool'],
     'fsync' => ['bool', 'stream' => 'resource'],
     'fdatasync' => ['bool', 'stream' => 'resource'],
     'imageavif' => ['bool', 'image'=>'GdImage', 'file='=>'resource|string|null', 'quality='=>'int', 'speed='=>'int'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -78,10 +78,7 @@ class InternalCallMapHandlerTest extends TestCase
         'enchant_dict_quick_check',
         'enchant_dict_store_replacement',
         'enchant_dict_suggest',
-        'enum_exists',
-        'get_class_methods',
         'get_headers',
-        'get_parent_class',
         'gmp_clrbit',
         'gmp_div',
         'gmp_setbit',