Skip to content

Commit a0af84b

Browse files
committed
Fixed bug #81088 error in regression test for oci_fetch_object() and oci_fetch_array()
Closes GH-7072
1 parent 15ec740 commit a0af84b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

NEWS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ PHP NEWS
88
. Fixed bug #81068 (Double free in realpath_cache_clean()). (Dimitry Andric)
99
. Fixed bug #76359 (open_basedir bypass through adding ".."). (cmb)
1010

11+
- OCI8:
12+
. Fixed bug #81088 (error in regression test for oci_fetch_object() and
13+
oci_fetch_array()). (Máté)
14+
1115
- Opcache:
1216
. Fixed bug #81051 (Broken property type handling after incrementing
1317
reference). (Dmitry)
@@ -61,7 +65,7 @@ PHP NEWS
6165
(Nikita)
6266

6367
- PDO_MySQL:
64-
. Fixed bug #81037 (PDO discards error message text from prepared
68+
. Fixed bug #81037 (PDO discards error message text from prepared
6569
statement). (Kamil Tekiela)
6670

6771
- PDO_ODBC:

ext/oci8/oci8.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ function oci_fetch_all($statement, &$output, int $offset = 0, int $limit = -1, i
250250
function ocifetchstatement($statement, &$output, int $offset = 0, int $limit = -1, int $flags = 0): int {}
251251

252252
/** @param resource $statement */
253-
function oci_fetch_object($statement, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|false {}
253+
function oci_fetch_object($statement, int $mode = OCI_ASSOC | OCI_RETURN_NULLS): stdClass|false {}
254254

255255
/** @param resource $statement */
256256
function oci_fetch_row($statement): array|false {}
@@ -259,7 +259,7 @@ function oci_fetch_row($statement): array|false {}
259259
function oci_fetch_assoc($statement): array|false {}
260260

261261
/** @param resource $statement */
262-
function oci_fetch_array($statement, int $mode = PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS): array|false {}
262+
function oci_fetch_array($statement, int $mode = OCI_BOTH | OCI_RETURN_NULLS): array|false {}
263263

264264
/** @param resource $statement */
265265
function oci_free_statement($statement): bool {}

ext/oci8/oci8_arginfo.h

Lines changed: 3 additions & 3 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: 7355ccbef6b490db7ddec94d485fbfb4597c3150 */
2+
* Stub hash: dfdfd80652d83f82d9bbe3743cd9137c2ab1668e */
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)
@@ -223,7 +223,7 @@ ZEND_END_ARG_INFO()
223223

224224
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_fetch_object, 0, 1, stdClass, MAY_BE_FALSE)
225225
ZEND_ARG_INFO(0, statement)
226-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS")
226+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_ASSOC | OCI_RETURN_NULLS")
227227
ZEND_END_ARG_INFO()
228228

229229
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_fetch_row, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
@@ -234,7 +234,7 @@ ZEND_END_ARG_INFO()
234234

235235
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_fetch_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
236236
ZEND_ARG_INFO(0, statement)
237-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS")
237+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_BOTH | OCI_RETURN_NULLS")
238238
ZEND_END_ARG_INFO()
239239

240240
#define arginfo_oci_free_statement arginfo_oci_cancel

0 commit comments

Comments
 (0)