archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #81088 error in regression test for oci_fetch_object() and oci_fetch_array()

Browse source 
Closes GH-7072
This commit is contained in:
Máté Kocsis 2021-05-28 17:53:32 +02:00
parent 15ec7404f1
commit a0af84bebd
No known key found for this signature in database
GPG key ID: FD055E41728BF310
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -8,6 +8,10 @@ PHP NEWS
. Fixed bug #81068 (Double free in realpath_cache_clean()). (Dimitry Andric)
. Fixed bug #76359 (open_basedir bypass through adding ".."). (cmb)
- OCI8:
. Fixed bug #81088 (error in regression test for oci_fetch_object() and
oci_fetch_array()). (Máté)
- Opcache:
. Fixed bug #81051 (Broken property type handling after incrementing
reference). (Dmitry)
@ -61,7 +65,7 @@ PHP NEWS
(Nikita)
- PDO_MySQL:
. Fixed bug #81037 (PDO discards error message text from prepared
. Fixed bug #81037 (PDO discards error message text from prepared
statement). (Kamil Tekiela)
- PDO_ODBC:

4
ext/oci8/oci8.stub.php
View file

@ -250,7 +250,7 @@ function oci_fetch_all($statement, &$output, int $offset = 0, int $limit = -1, i
function ocifetchstatement($statement, &$output, int $offset = 0, int $limit = -1, int $flags = 0): int {}
/** @param resource $statement */
function oci_fetch_object($statement, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|false {}
function oci_fetch_object($statement, int $mode = OCI_ASSOC | OCI_RETURN_NULLS): stdClass|false {}
/** @param resource $statement */
function oci_fetch_row($statement): array|false {}
@ -259,7 +259,7 @@ function oci_fetch_row($statement): array|false {}
function oci_fetch_assoc($statement): array|false {}
/** @param resource $statement */
function oci_fetch_array($statement, int $mode = PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS): array|false {}
function oci_fetch_array($statement, int $mode = OCI_BOTH | OCI_RETURN_NULLS): array|false {}
/** @param resource $statement */
function oci_free_statement($statement): bool {}

6
ext/oci8/oci8_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 7355ccbef6b490db7ddec94d485fbfb4597c3150 */
* Stub hash: dfdfd80652d83f82d9bbe3743cd9137c2ab1668e */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
ZEND_ARG_INFO(0, statement)
@ -223,7 +223,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_fetch_object, 0, 1, stdClass, MAY_BE_FALSE)
ZEND_ARG_INFO(0, statement)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_ASSOC | OCI_RETURN_NULLS")
ZEND_END_ARG_INFO()
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()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_fetch_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
ZEND_ARG_INFO(0, statement)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_BOTH | OCI_RETURN_NULLS")
ZEND_END_ARG_INFO()
#define arginfo_oci_free_statement arginfo_oci_cancel