Skip to content

Commit 11f4a5e

Browse files
jensdenieskocsismate
authored andcommitted
Removed the "oci_internal_debug" function and its alias. Also deprecated the "ocifetchinto" function.
Closes GH-5810
1 parent f06a6b4 commit 11f4a5e

File tree

8 files changed

+3
-1009
lines changed

8 files changed

+3
-1009
lines changed

ext/oci8/oci8.stub.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,6 @@ function oci_field_is_null($statement_resource, string|int $column_number_or_nam
226226
*/
227227
function ocicolumnisnull($statement_resource, string|int $column_number_or_name): bool {}
228228

229-
function oci_internal_debug(bool $mode): void {}
230-
231-
/**
232-
* @alias oci_internal_debug
233-
* @deprecated
234-
*/
235-
function ociinternaldebug(bool $mode): void {}
236-
237229
/**
238230
* @param resource $statement_resource
239231
*/
@@ -273,6 +265,7 @@ function ocifetch($statement_resource): bool {}
273265
/**
274266
* @param resource $statement_resource
275267
* @param array $result
268+
* @deprecated
276269
*/
277270
function ocifetchinto($statement_resource, &$result, int $mode = OCI_NUM): int|false {}
278271

ext/oci8/oci8_arginfo.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 9b7f698c1f9f099a392760d85d2bb85e17846f13 */
2+
* Stub hash: 157a4128645b816f23fb0bcbbb5860362f446cb3 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
55
ZEND_ARG_INFO(0, statement_resource)
@@ -188,12 +188,6 @@ ZEND_END_ARG_INFO()
188188

189189
#define arginfo_ocicolumnisnull arginfo_oci_field_is_null
190190

191-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_internal_debug, 0, 1, IS_VOID, 0)
192-
ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
193-
ZEND_END_ARG_INFO()
194-
195-
#define arginfo_ociinternaldebug arginfo_oci_internal_debug
196-
197191
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_execute, 0, 1, _IS_BOOL, 0)
198192
ZEND_ARG_INFO(0, statement_resource)
199193
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);
581575
ZEND_FUNCTION(oci_field_type);
582576
ZEND_FUNCTION(oci_field_type_raw);
583577
ZEND_FUNCTION(oci_field_is_null);
584-
ZEND_FUNCTION(oci_internal_debug);
585578
ZEND_FUNCTION(oci_execute);
586579
ZEND_FUNCTION(oci_cancel);
587580
ZEND_FUNCTION(oci_fetch);
@@ -681,15 +674,13 @@ static const zend_function_entry ext_functions[] = {
681674
ZEND_DEP_FALIAS(ocicolumntyperaw, oci_field_type_raw, arginfo_ocicolumntyperaw)
682675
ZEND_FE(oci_field_is_null, arginfo_oci_field_is_null)
683676
ZEND_DEP_FALIAS(ocicolumnisnull, oci_field_is_null, arginfo_ocicolumnisnull)
684-
ZEND_FE(oci_internal_debug, arginfo_oci_internal_debug)
685-
ZEND_DEP_FALIAS(ociinternaldebug, oci_internal_debug, arginfo_ociinternaldebug)
686677
ZEND_FE(oci_execute, arginfo_oci_execute)
687678
ZEND_DEP_FALIAS(ociexecute, oci_execute, arginfo_ociexecute)
688679
ZEND_FE(oci_cancel, arginfo_oci_cancel)
689680
ZEND_DEP_FALIAS(ocicancel, oci_cancel, arginfo_ocicancel)
690681
ZEND_FE(oci_fetch, arginfo_oci_fetch)
691682
ZEND_DEP_FALIAS(ocifetch, oci_fetch, arginfo_ocifetch)
692-
ZEND_FE(ocifetchinto, arginfo_ocifetchinto)
683+
ZEND_DEP_FE(ocifetchinto, arginfo_ocifetchinto)
693684
ZEND_FE(oci_fetch_all, arginfo_oci_fetch_all)
694685
ZEND_DEP_FALIAS(ocifetchstatement, oci_fetch_all, arginfo_ocifetchstatement)
695686
ZEND_FE(oci_fetch_object, arginfo_oci_fetch_object)

ext/oci8/oci8_interface.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,13 +1241,6 @@ PHP_FUNCTION(oci_field_is_null)
12411241
}
12421242
/* }}} */
12431243

1244-
/* {{{ Toggle internal debugging output for the OCI extension */
1245-
PHP_FUNCTION(oci_internal_debug)
1246-
{
1247-
/* NOP in OCI8 2.0. Obsoleted by DTrace probes */
1248-
}
1249-
/* }}} */
1250-
12511244
/* {{{ Execute a parsed statement */
12521245
PHP_FUNCTION(oci_execute)
12531246
{

ext/oci8/tests/debug.phpt

Lines changed: 0 additions & 24 deletions
This file was deleted.

ext/oci8/tests/existence_aliases.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var_dump(function_exists('ocicancel'));
1919
var_dump(function_exists('ocifetch'));
2020
var_dump(function_exists('ocifetchstatement'));
2121
var_dump(function_exists('ocifreestatement'));
22-
var_dump(function_exists('ociinternaldebug'));
2322
var_dump(function_exists('ocinumcols'));
2423
var_dump(function_exists('ociparse'));
2524
var_dump(function_exists('ocinewcursor'));
@@ -97,4 +96,3 @@ bool(true)
9796
bool(true)
9897
bool(true)
9998
bool(true)
100-
bool(true)

ext/oci8/tests/field_funcs1.phpt

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ var_dump(oci_field_scale($s, "none"));
5050
var_dump(oci_field_precision($s, "none"));
5151
var_dump(oci_field_size($s, "none"));
5252

53-
echo "Test 4\n";
54-
var_dump(oci_field_is_null($s, array()));
55-
var_dump(oci_field_name($s, array()));
56-
var_dump(oci_field_type($s, array()));
57-
var_dump(oci_field_type_raw($s, array()));
58-
var_dump(oci_field_scale($s, array()));
59-
var_dump(oci_field_precision($s, array()));
60-
var_dump(oci_field_size($s, array()));
61-
6253
// Cleanup
6354

6455
$stmtarray = array(
@@ -121,26 +112,4 @@ bool(false)
121112

122113
Warning: oci_field_size(): Invalid column name "none" in %s on line %d
123114
bool(false)
124-
Test 4
125-
126-
Warning: oci_field_is_null(): Invalid column index "0" in %s on line %d
127-
bool(false)
128-
129-
Warning: oci_field_name(): Invalid column index "0" in %s on line %d
130-
bool(false)
131-
132-
Warning: oci_field_type(): Invalid column index "0" in %s on line %d
133-
bool(false)
134-
135-
Warning: oci_field_type_raw(): Invalid column index "0" in %s on line %d
136-
bool(false)
137-
138-
Warning: oci_field_scale(): Invalid column index "0" in %s on line %d
139-
bool(false)
140-
141-
Warning: oci_field_precision(): Invalid column index "0" in %s on line %d
142-
bool(false)
143-
144-
Warning: oci_field_size(): Invalid column index "0" in %s on line %d
145-
bool(false)
146115
Done

0 commit comments

Comments
 (0)