Skip to content

Removed "oci_internal_debug" and its alias. Also deprecated "ocifetchinto" #5810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Removed "oci_internal_debug" and its alias. Also deprecated "ocifetchinto" #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdbaa21
Removed the "oci_internal_debug" function and its alias. Also depreca…
jensdenies Jul 5, 2020
719b4a5
Removed reflection tests.
jensdenies Jul 6, 2020
bb36a9a
Removed oci_internal_debug function implementation.
jensdenies Jul 7, 2020
2617ade
Removed ZPP test.
jensdenies Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions ext/oci8/oci8.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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 {}

Expand Down
13 changes: 2 additions & 11 deletions ext/oci8/oci8_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions ext/oci8/oci8_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
24 changes: 0 additions & 24 deletions ext/oci8/tests/debug.phpt
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ext/oci8/tests/existence_aliases.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -97,4 +96,3 @@ bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
31 changes: 0 additions & 31 deletions ext/oci8/tests/field_funcs1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Loading