Fix remaining callmap functions

vimeo · Feb 13, 2023 · 7f4e3c6 · 7f4e3c6
1 parent 5d1fe88
commit 7f4e3c6
Show file tree

Hide file tree

Showing 9 changed files with 334 additions and 250 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
diff --git a/dictionaries/CallMap_71_delta.php b/dictionaries/CallMap_71_delta.php
@@ -27,7 +27,7 @@
     'pcntl_async_signals' => ['bool', 'enable='=>'bool'],
     'pcntl_signal_get_handler' => ['int|string', 'signal'=>'int'],
     'sapi_windows_cp_conv' => ['?string', 'in_codepage'=>'int|string', 'out_codepage'=>'int|string', 'subject'=>'string'],
-    'sapi_windows_cp_get' => ['int'],
+    'sapi_windows_cp_get' => ['int', 'kind'=>'int'],
     'sapi_windows_cp_is_utf8' => ['bool'],
     'sapi_windows_cp_set' => ['bool', 'codepage'=>'int'],
     'session_create_id' => ['string', 'prefix='=>'string'],
@@ -56,11 +56,11 @@
     ],
     'pg_fetch_all' => [
       'old' => ['array<array>', 'result'=>'resource'],
-      'new' => ['array<array>', 'result'=>'resource', 'result_type='=>'int'],
+      'new' => ['array<array>', 'result'=>'resource', 'mode='=>'int'],
     ],
     'pg_select' => [
-      'old' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'assoc_array'=>'array', 'options='=>'int'],
-      'new' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'assoc_array'=>'array', 'options='=>'int', 'result_type='=>'int'],
+      'old' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'conditions'=>'array', 'flags='=>'int'],
+      'new' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'conditions'=>'array', 'flags='=>'int', 'mode='=>'int'],
     ],
     'timezone_identifiers_list' => [
       'old' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string'],

diff --git a/dictionaries/CallMap_72_delta.php b/dictionaries/CallMap_72_delta.php
@@ -75,14 +75,14 @@
     'sodium_crypto_box_seal_open' => ['string|false', 'ciphertext'=>'string', 'key_pair'=>'string'],
     'sodium_crypto_box_secretkey' => ['string', 'key_pair'=>'string'],
     'sodium_crypto_box_seed_keypair' => ['string', 'seed'=>'string'],
-    'sodium_crypto_generichash' => ['string', 'message'=>'string', 'key='=>'?string', 'length='=>'?int'],
-    'sodium_crypto_generichash_final' => ['string', '&state'=>'string', 'length='=>'?int'],
-    'sodium_crypto_generichash_init' => ['string', 'key='=>'?string', 'length='=>'?int'],
+    'sodium_crypto_generichash' => ['string', 'message'=>'string', 'key='=>'string', 'length='=>'int'],
+    'sodium_crypto_generichash_final' => ['string', '&state'=>'string', 'length='=>'int'],
+    'sodium_crypto_generichash_init' => ['string', 'key='=>'string', 'length='=>'int'],
     'sodium_crypto_generichash_keygen' => ['non-empty-string'],
-    'sodium_crypto_generichash_update' => ['bool', '&rw_state'=>'string', 'string'=>'string'],
+    'sodium_crypto_generichash_update' => ['true', '&rw_state'=>'string', 'message'=>'string'],
     'sodium_crypto_kdf_derive_from_key' => ['string', 'subkey_length'=>'int', 'subkey_id'=>'int', 'context'=>'string', 'key'=>'string'],
     'sodium_crypto_kdf_keygen' => ['non-empty-string'],
-    'sodium_crypto_kx_client_session_keys' => ['array<int,string>', 'client_keypair'=>'string', 'server_key'=>'string'],
+    'sodium_crypto_kx_client_session_keys' => ['array<int,string>', 'client_key_pair'=>'string', 'server_key'=>'string'],
     'sodium_crypto_kx_keypair' => ['string'],
     'sodium_crypto_kx_publickey' => ['string', 'key_pair'=>'string'],
     'sodium_crypto_kx_secretkey' => ['string', 'key_pair'=>'string'],
@@ -105,7 +105,7 @@
     'sodium_crypto_secretstream_xchacha20poly1305_keygen' => ['non-empty-string'],
     'sodium_crypto_secretstream_xchacha20poly1305_pull' => ['array', '&r_state'=>'string', 'ciphertext'=>'string', 'additional_data='=>'string'],
     'sodium_crypto_secretstream_xchacha20poly1305_push' => ['string', '&w_state'=>'string', 'message'=>'string', 'additional_data='=>'string', 'tag='=>'int'],
-    'sodium_crypto_secretstream_xchacha20poly1305_rekey' => ['void', 'state'=>'string'],
+    'sodium_crypto_secretstream_xchacha20poly1305_rekey' => ['void', '&w_state'=>'string'],
     'sodium_crypto_shorthash' => ['string', 'message'=>'string', 'key'=>'string'],
     'sodium_crypto_shorthash_keygen' => ['non-empty-string'],
     'sodium_crypto_sign' => ['string', 'message'=>'string', 'secret_key'=>'string'],

diff --git a/dictionaries/CallMap_73_delta.php b/dictionaries/CallMap_73_delta.php
@@ -62,10 +62,54 @@
       'old' => ['int', 'scale'=>'int'],
       'new' => ['int', 'scale='=>'int'],
     ],
+    'ldap_compare' => [
+      'old' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string'],
+      'new' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string', 'controls='=>'array'],
+    ],
+    'ldap_delete' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'controls='=>'array'],
+    ],
     'ldap_exop_passwd' => [
       'old' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string'],
       'new' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string', '&w_controls='=>'array'],
     ],
+    'ldap_list' => [
+      'old' => ['resource|false', 'ldap'=>'resource|array', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'],
+      'new' => ['resource|false', 'ldap'=>'resource|array', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int', 'controls='=>'array'],
+    ],
+    'ldap_mod_add' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array', 'controls='=>'array'],
+    ],
+    'ldap_mod_del' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array', 'controls='=>'array'],
+    ],
+    'ldap_mod_replace' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array', 'controls='=>'array'],
+    ],
+    'ldap_modify' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array', 'controls='=>'array'],
+    ],
+    'ldap_modify_batch' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'modifications_info'=>'array'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'modifications_info'=>'array', 'controls='=>'array'],
+    ],
+    'ldap_read' => [
+      'old' => ['resource|false', 'ldap'=>'resource|array', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'],
+      'new' => ['resource|false', 'ldap'=>'resource|array', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int', 'controls='=>'array'],
+    ],
+    'ldap_rename' => [
+      'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'new_rdn'=>'string', 'new_parent'=>'string', 'delete_old_rdn'=>'bool'],
+      'new' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'new_rdn'=>'string', 'new_parent'=>'string', 'delete_old_rdn'=>'bool', 'controls='=>'array'],
+    ],
+    'ldap_search' => [
+      'old' => ['resource|false', 'ldap'=>'resource|resource[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'],
+      'new' => ['resource|false', 'ldap'=>'resource|resource[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int', 'controls='=>'array'],
+    ],
   ],
   'removed' => [
   ],

diff --git a/dictionaries/CallMap_74_delta.php b/dictionaries/CallMap_74_delta.php
@@ -53,6 +53,22 @@
       'old' => ['bool', 'hash'=>'string', 'algo'=>'int', 'options='=>'array'],
       'new' => ['bool', 'hash'=>'string', 'algo'=>'int|string|null', 'options='=>'array'],
     ],
+    'preg_replace_callback' => [
+      'old' => ['string|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int'],
+      'new' => ['string|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int', 'flags='=>'int'],
+    ],
+    'preg_replace_callback\'1' => [
+      'old' => ['string[]|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int'],
+      'new' => ['string[]|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int', 'flags='=>'int'],
+    ],
+    'preg_replace_callback_array' => [
+      'old' => ['string|null', 'pattern'=>'array<string,callable(array):string>', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int'],
+      'new' => ['string|null', 'pattern'=>'array<string,callable(array):string>', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int', 'flags='=>'int'],
+    ],
+    'preg_replace_callback_array\'1' => [
+        'old' => ['string[]|null', 'pattern'=>'array<string,callable(array):string>', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int'],
+        'new' => ['string[]|null', 'pattern'=>'array<string,callable(array):string>', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int', 'flags='=>'int'],
+    ],
     'proc_open' => [
       'old' => ['resource|false', 'command'=>'string', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],
       'new' => ['resource|false', 'command'=>'string|array', 'descriptor_spec'=>'array', '&pipes'=>'resource[]', 'cwd='=>'?string', 'env_vars='=>'?array', 'options='=>'?array'],