diff --git a/ext/oci8/oci8.stub.php b/ext/oci8/oci8.stub.php index e3ef6fb3cc6b9..cf870f8acb4b8 100644 --- a/ext/oci8/oci8.stub.php +++ b/ext/oci8/oci8.stub.php @@ -226,14 +226,6 @@ function oci_field_is_null($statement_resource, string|int $column_number_or_nam */ function ocicolumnisnull($statement_resource, string|int $column_number_or_name): bool {} -function oci_internal_debug(bool $mode): void {} - -/** - * @alias oci_internal_debug - * @deprecated - */ -function ociinternaldebug(bool $mode): void {} - /** * @param resource $statement_resource */ @@ -273,6 +265,7 @@ function ocifetch($statement_resource): bool {} /** * @param resource $statement_resource * @param array $result + * @deprecated */ function ocifetchinto($statement_resource, &$result, int $mode = OCI_NUM): int|false {} diff --git a/ext/oci8/oci8_arginfo.h b/ext/oci8/oci8_arginfo.h index 334e9d672c512..90aee86841266 100644 --- a/ext/oci8/oci8_arginfo.h +++ b/ext/oci8/oci8_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 9b7f698c1f9f099a392760d85d2bb85e17846f13 */ + * Stub hash: 157a4128645b816f23fb0bcbbb5860362f446cb3 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, statement_resource) @@ -188,12 +188,6 @@ ZEND_END_ARG_INFO() #define arginfo_ocicolumnisnull arginfo_oci_field_is_null -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_internal_debug, 0, 1, IS_VOID, 0) - ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0) -ZEND_END_ARG_INFO() - -#define arginfo_ociinternaldebug arginfo_oci_internal_debug - ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_execute, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, statement_resource) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_COMMIT_ON_SUCCESS") @@ -581,7 +575,6 @@ ZEND_FUNCTION(oci_field_precision); ZEND_FUNCTION(oci_field_type); ZEND_FUNCTION(oci_field_type_raw); ZEND_FUNCTION(oci_field_is_null); -ZEND_FUNCTION(oci_internal_debug); ZEND_FUNCTION(oci_execute); ZEND_FUNCTION(oci_cancel); ZEND_FUNCTION(oci_fetch); @@ -681,15 +674,13 @@ static const zend_function_entry ext_functions[] = { ZEND_DEP_FALIAS(ocicolumntyperaw, oci_field_type_raw, arginfo_ocicolumntyperaw) ZEND_FE(oci_field_is_null, arginfo_oci_field_is_null) ZEND_DEP_FALIAS(ocicolumnisnull, oci_field_is_null, arginfo_ocicolumnisnull) - ZEND_FE(oci_internal_debug, arginfo_oci_internal_debug) - ZEND_DEP_FALIAS(ociinternaldebug, oci_internal_debug, arginfo_ociinternaldebug) ZEND_FE(oci_execute, arginfo_oci_execute) ZEND_DEP_FALIAS(ociexecute, oci_execute, arginfo_ociexecute) ZEND_FE(oci_cancel, arginfo_oci_cancel) ZEND_DEP_FALIAS(ocicancel, oci_cancel, arginfo_ocicancel) ZEND_FE(oci_fetch, arginfo_oci_fetch) ZEND_DEP_FALIAS(ocifetch, oci_fetch, arginfo_ocifetch) - ZEND_FE(ocifetchinto, arginfo_ocifetchinto) + ZEND_DEP_FE(ocifetchinto, arginfo_ocifetchinto) ZEND_FE(oci_fetch_all, arginfo_oci_fetch_all) ZEND_DEP_FALIAS(ocifetchstatement, oci_fetch_all, arginfo_ocifetchstatement) ZEND_FE(oci_fetch_object, arginfo_oci_fetch_object) diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index 2dba527625b86..58e069eb5d443 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -1241,13 +1241,6 @@ PHP_FUNCTION(oci_field_is_null) } /* }}} */ -/* {{{ Toggle internal debugging output for the OCI extension */ -PHP_FUNCTION(oci_internal_debug) -{ - /* NOP in OCI8 2.0. Obsoleted by DTrace probes */ -} -/* }}} */ - /* {{{ Execute a parsed statement */ PHP_FUNCTION(oci_execute) { diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt deleted file mode 100644 index f66eeb9698039..0000000000000 --- a/ext/oci8/tests/debug.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -oci_internal_debug() ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECT-- -===DONE=== diff --git a/ext/oci8/tests/existence_aliases.phpt b/ext/oci8/tests/existence_aliases.phpt index e2c224e8a5fc0..153c1bcf16a7f 100644 --- a/ext/oci8/tests/existence_aliases.phpt +++ b/ext/oci8/tests/existence_aliases.phpt @@ -19,7 +19,6 @@ var_dump(function_exists('ocicancel')); var_dump(function_exists('ocifetch')); var_dump(function_exists('ocifetchstatement')); var_dump(function_exists('ocifreestatement')); -var_dump(function_exists('ociinternaldebug')); var_dump(function_exists('ocinumcols')); var_dump(function_exists('ociparse')); var_dump(function_exists('ocinewcursor')); @@ -97,4 +96,3 @@ bool(true) bool(true) bool(true) bool(true) -bool(true) diff --git a/ext/oci8/tests/field_funcs1.phpt b/ext/oci8/tests/field_funcs1.phpt index 6557dcd4b2f96..615cf03217ac1 100644 --- a/ext/oci8/tests/field_funcs1.phpt +++ b/ext/oci8/tests/field_funcs1.phpt @@ -50,15 +50,6 @@ var_dump(oci_field_scale($s, "none")); var_dump(oci_field_precision($s, "none")); var_dump(oci_field_size($s, "none")); -echo "Test 4\n"; -var_dump(oci_field_is_null($s, array())); -var_dump(oci_field_name($s, array())); -var_dump(oci_field_type($s, array())); -var_dump(oci_field_type_raw($s, array())); -var_dump(oci_field_scale($s, array())); -var_dump(oci_field_precision($s, array())); -var_dump(oci_field_size($s, array())); - // Cleanup $stmtarray = array( @@ -121,26 +112,4 @@ bool(false) Warning: oci_field_size(): Invalid column name "none" in %s on line %d bool(false) -Test 4 - -Warning: oci_field_is_null(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_name(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_type(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_type_raw(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_scale(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_precision(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_size(): Invalid column index "0" in %s on line %d -bool(false) Done diff --git a/ext/oci8/tests/reflection1.phpt b/ext/oci8/tests/reflection1.phpt deleted file mode 100644 index 3420387326e32..0000000000000 --- a/ext/oci8/tests/reflection1.phpt +++ /dev/null @@ -1,671 +0,0 @@ ---TEST-- -Test OCI8 Reflection ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Function [ function oci_define_by_name ] { - - - Parameters [4] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_name ] - Parameter #2 [ &$variable ] - Parameter #3 [ $type ] - } -} - -Function [ function oci_bind_by_name ] { - - - Parameters [5] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_name ] - Parameter #2 [ &$variable ] - Parameter #3 [ $maximum_length ] - Parameter #4 [ $type ] - } -} - -Function [ function oci_bind_array_by_name ] { - - - Parameters [6] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_name ] - Parameter #2 [ &$variable ] - Parameter #3 [ $maximum_array_length ] - Parameter #4 [ $maximum_item_length ] - Parameter #5 [ $type ] - } -} - -Function [ function oci_field_is_null ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_name ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_size ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_scale ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_precision ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_type ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_field_type_raw ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_execute ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $mode ] - } -} - -Function [ function oci_cancel ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_fetch ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_fetch_object ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_fetch_row ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_fetch_assoc ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_fetch_array ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $mode ] - } -} - -Function [ function oci_fetch_all ] { - - - Parameters [5] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ &$output ] - Parameter #2 [ $skip ] - Parameter #3 [ $maximum_rows ] - Parameter #4 [ $flags ] - } -} - -Function [ function oci_free_statement ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_internal_debug ] { - - - Parameters [1] { - Parameter #0 [ $mode ] - } -} - -Function [ function oci_num_fields ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_parse ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $sql_text ] - } -} - -Function [ function oci_new_cursor ] { - - - Parameters [1] { - Parameter #0 [ $connection_resource ] - } -} - -Function [ function oci_result ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $column_number_or_name ] - } -} - -Function [ function oci_server_version ] { - - - Parameters [1] { - Parameter #0 [ $connection_resource ] - } -} - -Function [ function oci_statement_type ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_num_rows ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_close ] { - - - Parameters [1] { - Parameter #0 [ $connection_resource ] - } -} - -Function [ function oci_connect ] { - - - Parameters [5] { - Parameter #0 [ $username ] - Parameter #1 [ $password ] - Parameter #2 [ $connection_string ] - Parameter #3 [ $character_set ] - Parameter #4 [ $session_mode ] - } -} - -Function [ function oci_new_connect ] { - - - Parameters [5] { - Parameter #0 [ $username ] - Parameter #1 [ $password ] - Parameter #2 [ $connection_string ] - Parameter #3 [ $character_set ] - Parameter #4 [ $session_mode ] - } -} - -Function [ function oci_pconnect ] { - - - Parameters [5] { - Parameter #0 [ $username ] - Parameter #1 [ $password ] - Parameter #2 [ $connection_string ] - Parameter #3 [ $character_set ] - Parameter #4 [ $session_mode ] - } -} - -Function [ function oci_error ] { - - - Parameters [1] { - Parameter #0 [ $connection_or_statement_resource ] - } -} - -Function [ function oci_free_descriptor ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_save ] { - - - Parameters [3] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $data ] - Parameter #2 [ $offset ] - } -} - -Function [ function oci_lob_import ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $filename ] - } -} - -Function [ function oci_lob_size ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_load ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_read ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $length ] - } -} - -Function [ function oci_lob_eof ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_tell ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_truncate ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $length ] - } -} - -Function [ function oci_lob_erase ] { - - - Parameters [3] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $offset ] - Parameter #2 [ $length ] - } -} - -Function [ function oci_lob_flush ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $flag ] - } -} - -Function [ function ocisetbufferinglob ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $mode ] - } -} - -Function [ function ocigetbufferinglob ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_is_equal ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_rewind ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor ] - } -} - -Function [ function oci_lob_write ] { - - - Parameters [3] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $string ] - Parameter #2 [ $length ] - } -} - -Function [ function oci_lob_append ] { - - - Parameters [2] { - Parameter #0 [ $lob_descriptor_to ] - Parameter #1 [ $lob_descriptor_from ] - } -} - -Function [ function oci_lob_copy ] { - - - Parameters [3] { - Parameter #0 [ $lob_descriptor_to ] - Parameter #1 [ $lob_descriptor_from ] - Parameter #2 [ $length ] - } -} - -Function [ function oci_lob_export ] { - - - Parameters [4] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $filename ] - Parameter #2 [ $start ] - Parameter #3 [ $length ] - } -} - -Function [ function oci_lob_seek ] { - - - Parameters [3] { - Parameter #0 [ $lob_descriptor ] - Parameter #1 [ $offset ] - Parameter #2 [ $whence ] - } -} - -Function [ function oci_commit ] { - - - Parameters [1] { - Parameter #0 [ $connection_resource ] - } -} - -Function [ function oci_rollback ] { - - - Parameters [1] { - Parameter #0 [ $connection_resource ] - } -} - -Function [ function oci_new_descriptor ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $type ] - } -} - -Function [ function oci_set_prefetch ] { - - - Parameters [2] { - Parameter #0 [ $statement_resource ] - Parameter #1 [ $number_of_rows ] - } -} - -Function [ function oci_password_change ] { - - - Parameters [4] { - Parameter #0 [ $connection_resource_or_connection_string ] - Parameter #1 [ $username ] - Parameter #2 [ $old_password ] - Parameter #3 [ $new_password ] - } -} - -Function [ function oci_free_collection ] { - - - Parameters [1] { - Parameter #0 [ $collection ] - } -} - -Function [ function oci_collection_append ] { - - - Parameters [2] { - Parameter #0 [ $collection ] - Parameter #1 [ $value ] - } -} - -Function [ function oci_collection_element_get ] { - - - Parameters [2] { - Parameter #0 [ $collection ] - Parameter #1 [ $index ] - } -} - -Function [ function oci_collection_element_assign ] { - - - Parameters [3] { - Parameter #0 [ $collection ] - Parameter #1 [ $index ] - Parameter #2 [ $value ] - } -} - -Function [ function oci_collection_assign ] { - - - Parameters [2] { - Parameter #0 [ $collection_to ] - Parameter #1 [ $collection_from ] - } -} - -Function [ function oci_collection_size ] { - - - Parameters [1] { - Parameter #0 [ $collection ] - } -} - -Function [ function oci_collection_max ] { - - - Parameters [1] { - Parameter #0 [ $collection ] - } -} - -Function [ function oci_collection_trim ] { - - - Parameters [2] { - Parameter #0 [ $collection ] - Parameter #1 [ $number ] - } -} - -Function [ function oci_new_collection ] { - - - Parameters [3] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $type_name ] - Parameter #2 [ $schema_name ] - } -} - -Function [ function oci_free_cursor ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} - -Function [ function oci_set_edition ] { - - - Parameters [1] { - Parameter #0 [ $edition_name ] - } -} - -Function [ function oci_set_module_name ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $module_name ] - } -} - -Function [ function oci_set_action ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $action ] - } -} - -Function [ function oci_set_client_info ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $client_information ] - } -} - -Function [ function oci_set_client_identifier ] { - - - Parameters [2] { - Parameter #0 [ $connection_resource ] - Parameter #1 [ $client_identifier ] - } -} - -Function [ function oci_get_implicit_resultset ] { - - - Parameters [1] { - Parameter #0 [ $statement_resource ] - } -} \ No newline at end of file diff --git a/ext/oci8/tests/reflection2.phpt b/ext/oci8/tests/reflection2.phpt deleted file mode 100644 index 38ee637b2751c..0000000000000 --- a/ext/oci8/tests/reflection2.phpt +++ /dev/null @@ -1,255 +0,0 @@ ---TEST-- -Test OCI8 LOB & Collection Class Reflection ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Class [ class OCI-Lob ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [22] { - Method [ public method load ] { - - - Parameters [0] { - } - } - - Method [ public method tell ] { - - - Parameters [0] { - } - } - - Method [ public method truncate ] { - - - Parameters [1] { - Parameter #0 [ $length ] - } - } - - Method [ public method erase ] { - - - Parameters [2] { - Parameter #0 [ $offset ] - Parameter #1 [ $length ] - } - } - - Method [ public method flush ] { - - - Parameters [1] { - Parameter #0 [ $flag ] - } - } - - Method [ public method setbuffering ] { - - - Parameters [1] { - Parameter #0 [ $mode ] - } - } - - Method [ public method getbuffering ] { - - - Parameters [0] { - } - } - - Method [ public method rewind ] { - - - Parameters [0] { - } - } - - Method [ public method read ] { - - - Parameters [1] { - Parameter #0 [ $length ] - } - } - - Method [ public method eof ] { - - - Parameters [0] { - } - } - - Method [ public method seek ] { - - - Parameters [2] { - Parameter #0 [ $offset ] - Parameter #1 [ $whence ] - } - } - - Method [ public method write ] { - - - Parameters [2] { - Parameter #0 [ $string ] - Parameter #1 [ $length ] - } - } - - Method [ public method append ] { - - - Parameters [1] { - Parameter #0 [ $lob_descriptor_from ] - } - } - - Method [ public method size ] { - - - Parameters [0] { - } - } - - Method [ public method writetofile ] { - - - Parameters [3] { - Parameter #0 [ $filename ] - Parameter #1 [ $start ] - Parameter #2 [ $length ] - } - } - - Method [ public method export ] { - - - Parameters [3] { - Parameter #0 [ $filename ] - Parameter #1 [ $start ] - Parameter #2 [ $length ] - } - } - - Method [ public method import ] { - - - Parameters [1] { - Parameter #0 [ $filename ] - } - } - - Method [ public method writetemporary ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $type ] - } - } - - Method [ public method close ] { - - - Parameters [0] { - } - } - - Method [ public method save ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $offset ] - } - } - - Method [ public method savefile ] { - - - Parameters [1] { - Parameter #0 [ $filename ] - } - } - - Method [ public method free ] { - - - Parameters [0] { - } - } - } -} - -Class [ class OCI-Collection ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [8] { - Method [ public method append ] { - - - Parameters [1] { - Parameter #0 [ $value ] - } - } - - Method [ public method getelem ] { - - - Parameters [1] { - Parameter #0 [ $index ] - } - } - - Method [ public method assignelem ] { - - - Parameters [2] { - Parameter #0 [ $index ] - Parameter #1 [ $value ] - } - } - - Method [ public method assign ] { - - - Parameters [1] { - Parameter #0 [ $collection_from ] - } - } - - Method [ public method size ] { - - - Parameters [0] { - } - } - - Method [ public method max ] { - - - Parameters [0] { - } - } - - Method [ public method trim ] { - - - Parameters [1] { - Parameter #0 [ $number ] - } - } - - Method [ public method free ] { - - - Parameters [0] { - } - } - } -} -