Fix ocdb function signature

Author: VincentLanglet

resources/functionMap.php

@@ -7885,51 +7885,51 @@
 'ocigetbufferinglob' => ['bool'],
 'ocisetbufferinglob' => ['bool', 'flag'=>'bool'],
 'octdec' => ['int|float', 'octal_number'=>'string'],
-'odbc_autocommit' => ['mixed', 'connection_id'=>'resource', 'onoff='=>'bool'],
-'odbc_binmode' => ['bool', 'result_id'=>'int', 'mode'=>'int'],
-'odbc_close' => ['void', 'connection_id'=>'resource'],
+'odbc_autocommit' => ['mixed', 'odbc'=>'resource', 'enable='=>'bool'],
+'odbc_binmode' => ['bool', 'statement'=>'int', 'mode'=>'int'],
+'odbc_close' => ['void', 'odbc'=>'resource'],
 'odbc_close_all' => ['void'],
-'odbc_columnprivileges' => ['resource', 'connection_id'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'column'=>'string'],
-'odbc_columns' => ['resource', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'table_name='=>'string', 'column_name='=>'string'],
-'odbc_commit' => ['bool', 'connection_id'=>'resource'],
+'odbc_columnprivileges' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'column'=>'string'],
+'odbc_columns' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'string', 'schema='=>'string', 'table='=>'string', 'column='=>'string'],
+'odbc_commit' => ['bool', 'odbc'=>'resource'],
 'odbc_connect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
-'odbc_cursor' => ['string|false', 'result_id'=>'resource'],
-'odbc_data_source' => ['array|false', 'connection_id'=>'resource', 'fetch_type'=>'int'],
-'odbc_do' => ['resource', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
-'odbc_error' => ['string', 'connection_id='=>'resource'],
-'odbc_errormsg' => ['string', 'connection_id='=>'resource'],
-'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
-'odbc_execute' => ['bool', 'result_id'=>'resource', 'parameters_array='=>'array'],
-'odbc_fetch_array' => ['array|false', 'result'=>'resource', 'rownumber='=>'int'],
-'odbc_fetch_into' => ['int|false', 'result_id'=>'resource', '&w_result_array'=>'array', 'rownumber='=>'int'],
-'odbc_fetch_object' => ['object|false', 'result'=>'int', 'rownumber='=>'int'],
-'odbc_fetch_row' => ['bool', 'result_id'=>'resource', 'row_number='=>'int'],
-'odbc_field_len' => ['int|false', 'result_id'=>'resource', 'field_number'=>'int'],
-'odbc_field_name' => ['string|false', 'result_id'=>'resource', 'field_number'=>'int'],
-'odbc_field_num' => ['int|false', 'result_id'=>'resource', 'field_name'=>'string'],
-'odbc_field_precision' => ['int|false', 'result_id'=>'resource', 'field_number'=>'int'],
-'odbc_field_scale' => ['int|false', 'result_id'=>'resource', 'field_number'=>'int'],
-'odbc_field_type' => ['string|false', 'result_id'=>'resource', 'field_number'=>'int'],
-'odbc_foreignkeys' => ['resource', 'connection_id'=>'resource', 'pk_qualifier'=>'string', 'pk_owner'=>'string', 'pk_table'=>'string', 'fk_qualifier'=>'string', 'fk_owner'=>'string', 'fk_table'=>'string'],
-'odbc_free_result' => ['bool', 'result_id'=>'resource'],
-'odbc_gettypeinfo' => ['resource', 'connection_id'=>'resource', 'data_type='=>'int'],
-'odbc_longreadlen' => ['bool', 'result_id'=>'resource', 'length'=>'int'],
-'odbc_next_result' => ['bool', 'result_id'=>'resource'],
-'odbc_num_fields' => ['int', 'result_id'=>'resource'],
-'odbc_num_rows' => ['int', 'result_id'=>'resource'],
-'odbc_pconnect' => ['resource', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
-'odbc_prepare' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
-'odbc_primarykeys' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string'],
-'odbc_procedurecolumns' => ['resource', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'proc'=>'string', 'column'=>'string'],
-'odbc_procedures' => ['resource', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
-'odbc_result' => ['mixed', 'result_id'=>'resource', 'field'=>'mixed'],
-'odbc_result_all' => ['int|false', 'result_id'=>'resource', 'format='=>'string'],
-'odbc_rollback' => ['bool', 'connection_id'=>'resource'],
-'odbc_setoption' => ['bool', 'result_id'=>'resource', 'which'=>'int', 'option'=>'int', 'value'=>'int'],
-'odbc_specialcolumns' => ['resource', 'connection_id'=>'resource', 'type'=>'int', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string', 'scope'=>'int', 'nullable'=>'int'],
-'odbc_statistics' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string', 'unique'=>'int', 'accuracy'=>'int'],
-'odbc_tableprivileges' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
-'odbc_tables' => ['resource', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'name='=>'string', 'table_types='=>'string'],
+'odbc_cursor' => ['string|false', 'statement'=>'resource'],
+'odbc_data_source' => ['array|false', 'odbc'=>'resource', 'fetch_type'=>'int'],
+'odbc_do' => ['resource|false', 'odbc'=>'resource', 'query'=>'string', 'flags='=>'int'],
+'odbc_error' => ['string', 'odbc='=>'resource'],
+'odbc_errormsg' => ['string', 'odbc='=>'resource'],
+'odbc_exec' => ['resource|false', 'odbc'=>'resource', 'query'=>'string', 'flags='=>'int'],
+'odbc_execute' => ['bool', 'statement'=>'resource', 'params='=>'array'],
+'odbc_fetch_array' => ['array|false', 'statement'=>'resource', 'row='=>'int'],
+'odbc_fetch_into' => ['int|false', 'statement'=>'resource', '&w_array'=>'array', 'row='=>'int'],
+'odbc_fetch_object' => ['object|false', 'statement'=>'int', 'row='=>'int'],
+'odbc_fetch_row' => ['bool', 'statement'=>'resource', 'row='=>'int'],
+'odbc_field_len' => ['int|false', 'statement'=>'resource', 'field'=>'int'],
+'odbc_field_name' => ['string|false', 'statement'=>'resource', 'field'=>'int'],
+'odbc_field_num' => ['int|false', 'statement'=>'resource', 'field'=>'string'],
+'odbc_field_precision' => ['int|false', 'statement'=>'resource', 'field'=>'int'],
+'odbc_field_scale' => ['int|false', 'statement'=>'resource', 'field'=>'int'],
+'odbc_field_type' => ['string|false', 'statement'=>'resource', 'field'=>'int'],
+'odbc_foreignkeys' => ['resource|false', 'odbc'=>'resource', 'pk_catalog'=>'string', 'pk_schema'=>'string', 'pk_table'=>'string', 'fk_catalog'=>'string', 'fk_schema'=>'string', 'fk_table'=>'string'],
+'odbc_free_result' => ['bool', 'statement'=>'resource'],
+'odbc_gettypeinfo' => ['resource|false', 'odbc'=>'resource', 'data_type='=>'int'],
+'odbc_longreadlen' => ['bool', 'statement'=>'resource', 'length'=>'int'],
+'odbc_next_result' => ['bool', 'statement'=>'resource'],
+'odbc_num_fields' => ['int', 'statement'=>'resource'],
+'odbc_num_rows' => ['int', 'statement'=>'resource'],
+'odbc_pconnect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
+'odbc_prepare' => ['resource|false', 'odbc'=>'resource', 'query'=>'string'],
+'odbc_primarykeys' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string'],
+'odbc_procedurecolumns' => ['resource|false', 'odbc'=>'', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string', 'column'=>'string'],
+'odbc_procedures' => ['resource|false', 'odbc'=>'', 'catalog'=>'string', 'schema'=>'string', 'procedure'=>'string'],
+'odbc_result' => ['mixed', 'statement'=>'resource', 'field'=>'mixed'],
+'odbc_result_all' => ['int|false', 'statement'=>'resource', 'format='=>'string'],
+'odbc_rollback' => ['bool', 'odbc'=>'resource'],
+'odbc_setoption' => ['bool', 'odbc'=>'resource', 'which'=>'int', 'option'=>'int', 'value'=>'int'],
+'odbc_specialcolumns' => ['resource|false', 'odbc'=>'resource', 'type'=>'int', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'scope'=>'int', 'nullable'=>'int'],
+'odbc_statistics' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'unique'=>'int', 'accuracy'=>'int'],
+'odbc_tableprivileges' => ['resource|false', 'odbc'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string'],
+'odbc_tables' => ['resource|false', 'odbc'=>'resource', 'catalog='=>'string', 'schema='=>'string', 'table='=>'string', 'types='=>'string'],
 'opcache_compile_file' => ['bool', 'file'=>'string'],
 'opcache_get_configuration' => ['array|false'],
 'opcache_get_status' => ['array|false', 'get_scripts='=>'bool'],

resources/functionMap_php80delta.php

@@ -92,7 +92,8 @@
 		'mb_str_split' => ['list<string>', 'str'=>'string', 'split_length='=>'positive-int', 'encoding='=>'string'],
 		'mb_strlen' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
 		'mktime' => ['int|false', 'hour'=>'int', 'minute='=>'int', 'second='=>'int', 'month='=>'int', 'day='=>'int', 'year='=>'int'],
-		'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
+		'odbc_exec' => ['resource|false', 'odbc'=>'resource', 'query'=>'string'],
+		'odbc_do' => ['resource|false', 'odbc'=>'resource', 'query'=>'string'],
 		'parse_str' => ['void', 'encoded_string'=>'string', '&w_result'=>'array'],
 		'password_hash' => ['non-empty-string', 'password'=>'string', 'algo'=>'string|int|null', 'options='=>'array'],
 		'PDOStatement::fetchAll' => ['array', 'how='=>'int', 'fetch_argument='=>'int|string|callable', 'ctor_args='=>'?array'],