Removed the "oci_internal_debug" function and its alias. Also deprecated the "ocifetc...

Closes GH-5810

diff --git a/ext/oci8/oci8.stub.php b/ext/oci8/oci8.stub.php
index e3ef6fb3cc6b97cad4ce2f1a3fc23e437242659a..cf870f8acb4b8ebb48c0fef98451e2f0ae383271 100644 (file)
--- 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 334e9d672c512d0c8ce512f1a4c8cc07085495ee..90aee86841266ede59845d47715dd8b38e71e154 100644 (file)
--- 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 2dba527625b86e93f022b629bd4af23c20a7867e..58e069eb5d4437841e0ca7bb4bb651580df6ed83 100644 (file)
--- 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 (file)
index f66eeb9..0000000
--- a/ext/oci8/tests/debug.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-oci_internal_debug()
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---FILE--
-<?php
-
-require(__DIR__."/details.inc");
-
-oci_internal_debug(true);
-
-if (!empty($dbase)) {
-    oci_connect($user, $password, $dbase);
-}
-else {
-    oci_connect($user, $password);
-}
-
-oci_internal_debug(false);
-
-?>
-===DONE===
---EXPECT--
-===DONE===

diff --git a/ext/oci8/tests/existence_aliases.phpt b/ext/oci8/tests/existence_aliases.phpt
index e2c224e8a5fc0497de02650f463fde4c02c0b718..153c1bcf16a7f46a7b8184c603873962374119c2 100644 (file)
--- 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 6557dcd4b2f96e29ac76cf32b6aaff147333d802..615cf03217ac17386facd7071dfd693439766216 100644 (file)
--- 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 (file)
index 3420387..0000000
--- a/ext/oci8/tests/reflection1.phpt
+++ /dev/null
@@ -1,671 +0,0 @@
---TEST--
-Test OCI8 Reflection
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
---FILE--
-<?php
-
-/* ALL PHP_FE or PHP_ALIAS user callable functions should appear here */
-
-reflection::export(new reflectionfunction('oci_define_by_name'));
-reflection::export(new reflectionfunction('oci_bind_by_name'));
-reflection::export(new reflectionfunction('oci_bind_array_by_name'));
-reflection::export(new reflectionfunction('oci_field_is_null'));
-reflection::export(new reflectionfunction('oci_field_name'));
-reflection::export(new reflectionfunction('oci_field_size'));
-reflection::export(new reflectionfunction('oci_field_scale'));
-reflection::export(new reflectionfunction('oci_field_precision'));
-reflection::export(new reflectionfunction('oci_field_type'));
-reflection::export(new reflectionfunction('oci_field_type_raw'));
-reflection::export(new reflectionfunction('oci_execute'));
-reflection::export(new reflectionfunction('oci_cancel'));
-reflection::export(new reflectionfunction('oci_fetch'));
-reflection::export(new reflectionfunction('oci_fetch_object'));
-reflection::export(new reflectionfunction('oci_fetch_row'));
-reflection::export(new reflectionfunction('oci_fetch_assoc'));
-reflection::export(new reflectionfunction('oci_fetch_array'));
-reflection::export(new reflectionfunction('oci_fetch_all'));
-reflection::export(new reflectionfunction('oci_free_statement'));
-reflection::export(new reflectionfunction('oci_internal_debug'));
-reflection::export(new reflectionfunction('oci_num_fields'));
-reflection::export(new reflectionfunction('oci_parse'));
-reflection::export(new reflectionfunction('oci_new_cursor'));
-reflection::export(new reflectionfunction('oci_result'));
-reflection::export(new reflectionfunction('oci_server_version'));
-reflection::export(new reflectionfunction('oci_statement_type'));
-reflection::export(new reflectionfunction('oci_num_rows'));
-reflection::export(new reflectionfunction('oci_close'));
-reflection::export(new reflectionfunction('oci_connect'));
-reflection::export(new reflectionfunction('oci_new_connect'));
-reflection::export(new reflectionfunction('oci_pconnect'));
-reflection::export(new reflectionfunction('oci_error'));
-reflection::export(new reflectionfunction('oci_free_descriptor'));
-reflection::export(new reflectionfunction('oci_lob_save'));
-reflection::export(new reflectionfunction('oci_lob_import'));
-reflection::export(new reflectionfunction('oci_lob_size'));
-reflection::export(new reflectionfunction('oci_lob_load'));
-reflection::export(new reflectionfunction('oci_lob_read'));
-reflection::export(new reflectionfunction('oci_lob_eof'));
-reflection::export(new reflectionfunction('oci_lob_tell'));
-reflection::export(new reflectionfunction('oci_lob_truncate'));
-reflection::export(new reflectionfunction('oci_lob_erase'));
-reflection::export(new reflectionfunction('oci_lob_flush'));
-reflection::export(new reflectionfunction('ocisetbufferinglob'));
-reflection::export(new reflectionfunction('ocigetbufferinglob'));
-reflection::export(new reflectionfunction('oci_lob_is_equal'));
-reflection::export(new reflectionfunction('oci_lob_rewind'));
-reflection::export(new reflectionfunction('oci_lob_write'));
-reflection::export(new reflectionfunction('oci_lob_append'));
-reflection::export(new reflectionfunction('oci_lob_copy'));
-reflection::export(new reflectionfunction('oci_lob_export'));
-reflection::export(new reflectionfunction('oci_lob_seek'));
-reflection::export(new reflectionfunction('oci_commit'));
-reflection::export(new reflectionfunction('oci_rollback'));
-reflection::export(new reflectionfunction('oci_new_descriptor'));
-reflection::export(new reflectionfunction('oci_set_prefetch'));
-reflection::export(new reflectionfunction('oci_password_change'));
-reflection::export(new reflectionfunction('oci_free_collection'));
-reflection::export(new reflectionfunction('oci_collection_append'));
-reflection::export(new reflectionfunction('oci_collection_element_get'));
-reflection::export(new reflectionfunction('oci_collection_element_assign'));
-reflection::export(new reflectionfunction('oci_collection_assign'));
-reflection::export(new reflectionfunction('oci_collection_size'));
-reflection::export(new reflectionfunction('oci_collection_max'));
-reflection::export(new reflectionfunction('oci_collection_trim'));
-reflection::export(new reflectionfunction('oci_new_collection'));
-reflection::export(new reflectionfunction('oci_free_cursor'));
-reflection::export(new reflectionfunction('oci_set_edition'));
-reflection::export(new reflectionfunction('oci_set_module_name'));
-reflection::export(new reflectionfunction('oci_set_action'));
-reflection::export(new reflectionfunction('oci_set_client_info'));
-reflection::export(new reflectionfunction('oci_set_client_identifier'));
-reflection::export(new reflectionfunction('oci_get_implicit_resultset'));
-
-?>
---EXPECTF--
-Function [ <internal%s> function oci_define_by_name ] {
-
-  - Parameters [4] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_name ]
-    Parameter #2 [ <required> &$variable ]
-    Parameter #3 [ <optional> $type ]
-  }
-}
-
-Function [ <internal%s> function oci_bind_by_name ] {
-
-  - Parameters [5] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_name ]
-    Parameter #2 [ <required> &$variable ]
-    Parameter #3 [ <optional> $maximum_length ]
-    Parameter #4 [ <optional> $type ]
-  }
-}
-
-Function [ <internal%s> function oci_bind_array_by_name ] {
-
-  - Parameters [6] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_name ]
-    Parameter #2 [ <required> &$variable ]
-    Parameter #3 [ <required> $maximum_array_length ]
-    Parameter #4 [ <optional> $maximum_item_length ]
-    Parameter #5 [ <optional> $type ]
-  }
-}
-
-Function [ <internal%s> function oci_field_is_null ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_name ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_size ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_scale ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_precision ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_type ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_field_type_raw ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_execute ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <optional> $mode ]
-  }
-}
-
-Function [ <internal%s> function oci_cancel ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch_object ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch_row ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch_assoc ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch_array ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <optional> $mode ]
-  }
-}
-
-Function [ <internal%s> function oci_fetch_all ] {
-
-  - Parameters [5] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> &$output ]
-    Parameter #2 [ <optional> $skip ]
-    Parameter #3 [ <optional> $maximum_rows ]
-    Parameter #4 [ <optional> $flags ]
-  }
-}
-
-Function [ <internal%s> function oci_free_statement ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_internal_debug ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $mode ]
-  }
-}
-
-Function [ <internal%s> function oci_num_fields ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_parse ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $sql_text ]
-  }
-}
-
-Function [ <internal%s> function oci_new_cursor ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $connection_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_result ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number_or_name ]
-  }
-}
-
-Function [ <internal%s> function oci_server_version ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $connection_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_statement_type ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_num_rows ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_close ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $connection_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_connect ] {
-
-  - Parameters [5] {
-    Parameter #0 [ <required> $username ]
-    Parameter #1 [ <required> $password ]
-    Parameter #2 [ <optional> $connection_string ]
-    Parameter #3 [ <optional> $character_set ]
-    Parameter #4 [ <optional> $session_mode ]
-  }
-}
-
-Function [ <internal%s> function oci_new_connect ] {
-
-  - Parameters [5] {
-    Parameter #0 [ <required> $username ]
-    Parameter #1 [ <required> $password ]
-    Parameter #2 [ <optional> $connection_string ]
-    Parameter #3 [ <optional> $character_set ]
-    Parameter #4 [ <optional> $session_mode ]
-  }
-}
-
-Function [ <internal%s> function oci_pconnect ] {
-
-  - Parameters [5] {
-    Parameter #0 [ <required> $username ]
-    Parameter #1 [ <required> $password ]
-    Parameter #2 [ <optional> $connection_string ]
-    Parameter #3 [ <optional> $character_set ]
-    Parameter #4 [ <optional> $session_mode ]
-  }
-}
-
-Function [ <internal%s> function oci_error ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <optional> $connection_or_statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_free_descriptor ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_save ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $data ]
-    Parameter #2 [ <optional> $offset ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_import ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $filename ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_size ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_load ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_read ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_eof ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_tell ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_truncate ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <optional> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_erase ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <optional> $offset ]
-    Parameter #2 [ <optional> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_flush ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <optional> $flag ]
-  }
-}
-
-Function [ <internal%s> function ocisetbufferinglob ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $mode ]
-  }
-}
-
-Function [ <internal%s> function ocigetbufferinglob ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_is_equal ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_rewind ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $lob_descriptor ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_write ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $string ]
-    Parameter #2 [ <optional> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_append ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $lob_descriptor_to ]
-    Parameter #1 [ <required> $lob_descriptor_from ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_copy ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $lob_descriptor_to ]
-    Parameter #1 [ <required> $lob_descriptor_from ]
-    Parameter #2 [ <optional> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_export ] {
-
-  - Parameters [4] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $filename ]
-    Parameter #2 [ <optional> $start ]
-    Parameter #3 [ <optional> $length ]
-  }
-}
-
-Function [ <internal%s> function oci_lob_seek ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $lob_descriptor ]
-    Parameter #1 [ <required> $offset ]
-    Parameter #2 [ <optional> $whence ]
-  }
-}
-
-Function [ <internal%s> function oci_commit ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $connection_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_rollback ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $connection_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_new_descriptor ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <optional> $type ]
-  }
-}
-
-Function [ <internal%s> function oci_set_prefetch ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $number_of_rows ]
-  }
-}
-
-Function [ <internal%s> function oci_password_change ] {
-
-  - Parameters [4] {
-    Parameter #0 [ <required> $connection_resource_or_connection_string ]
-    Parameter #1 [ <required> $username ]
-    Parameter #2 [ <required> $old_password ]
-    Parameter #3 [ <required> $new_password ]
-  }
-}
-
-Function [ <internal%s> function oci_free_collection ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $collection ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_append ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $collection ]
-    Parameter #1 [ <required> $value ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_element_get ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $collection ]
-    Parameter #1 [ <required> $index ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_element_assign ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $collection ]
-    Parameter #1 [ <required> $index ]
-    Parameter #2 [ <required> $value ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_assign ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $collection_to ]
-    Parameter #1 [ <required> $collection_from ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_size ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $collection ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_max ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $collection ]
-  }
-}
-
-Function [ <internal%s> function oci_collection_trim ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $collection ]
-    Parameter #1 [ <required> $number ]
-  }
-}
-
-Function [ <internal%s> function oci_new_collection ] {
-
-  - Parameters [3] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $type_name ]
-    Parameter #2 [ <optional> $schema_name ]
-  }
-}
-
-Function [ <internal%s> function oci_free_cursor ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $statement_resource ]
-  }
-}
-
-Function [ <internal%s> function oci_set_edition ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $edition_name ]
-  }
-}
-
-Function [ <internal%s> function oci_set_module_name ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $module_name ]
-  }
-}
-
-Function [ <internal%s> function oci_set_action ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $action ]
-  }
-}
-
-Function [ <internal%s> function oci_set_client_info ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $client_information ]
-  }
-}
-
-Function [ <internal%s> function oci_set_client_identifier ] {
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $connection_resource ]
-    Parameter #1 [ <required> $client_identifier ]
-  }
-}
-
-Function [ <internal%s> function oci_get_implicit_resultset ] {
-
-  - Parameters [1] {
-    Parameter #0 [ <required> $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 (file)
index 38ee637..0000000
--- a/ext/oci8/tests/reflection2.phpt
+++ /dev/null
@@ -1,255 +0,0 @@
---TEST--
-Test OCI8 LOB & Collection Class Reflection
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
---FILE--
-<?php
-
-reflection::export(new reflectionclass('OCI-Lob'));
-reflection::export(new reflectionclass('OCI-Collection'));
-
-?>
---EXPECTF--
-Class [ <internal:oci8> class OCI-Lob ] {
-
-  - Constants [0] {
-  }
-
-  - Static properties [0] {
-  }
-
-  - Static methods [0] {
-  }
-
-  - Properties [0] {
-  }
-
-  - Methods [22] {
-    Method [ <internal%s> public method load ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method tell ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method truncate ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <optional> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method erase ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <optional> $offset ]
-        Parameter #1 [ <optional> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method flush ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <optional> $flag ]
-      }
-    }
-
-    Method [ <internal%s> public method setbuffering ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $mode ]
-      }
-    }
-
-    Method [ <internal%s> public method getbuffering ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method rewind ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method read ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method eof ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method seek ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $offset ]
-        Parameter #1 [ <optional> $whence ]
-      }
-    }
-
-    Method [ <internal%s> public method write ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $string ]
-        Parameter #1 [ <optional> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method append ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $lob_descriptor_from ]
-      }
-    }
-
-    Method [ <internal%s> public method size ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method writetofile ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $filename ]
-        Parameter #1 [ <optional> $start ]
-        Parameter #2 [ <optional> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method export ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $filename ]
-        Parameter #1 [ <optional> $start ]
-        Parameter #2 [ <optional> $length ]
-      }
-    }
-
-    Method [ <internal%s> public method import ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $filename ]
-      }
-    }
-
-    Method [ <internal%s> public method writetemporary ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $data ]
-        Parameter #1 [ <optional> $type ]
-      }
-    }
-
-    Method [ <internal%s> public method close ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method save ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $data ]
-        Parameter #1 [ <optional> $offset ]
-      }
-    }
-
-    Method [ <internal%s> public method savefile ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $filename ]
-      }
-    }
-
-    Method [ <internal%s> public method free ] {
-
-      - Parameters [0] {
-      }
-    }
-  }
-}
-
-Class [ <internal%s> class OCI-Collection ] {
-
-  - Constants [0] {
-  }
-
-  - Static properties [0] {
-  }
-
-  - Static methods [0] {
-  }
-
-  - Properties [0] {
-  }
-
-  - Methods [8] {
-    Method [ <internal%s> public method append ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $value ]
-      }
-    }
-
-    Method [ <internal%s> public method getelem ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $index ]
-      }
-    }
-
-    Method [ <internal%s> public method assignelem ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $index ]
-        Parameter #1 [ <required> $value ]
-      }
-    }
-
-    Method [ <internal%s> public method assign ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $collection_from ]
-      }
-    }
-
-    Method [ <internal%s> public method size ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method max ] {
-
-      - Parameters [0] {
-      }
-    }
-
-    Method [ <internal%s> public method trim ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $number ]
-      }
-    }
-
-    Method [ <internal%s> public method free ] {
-
-      - Parameters [0] {
-      }
-    }
-  }
-}
-