From 7325eb79cd04a527132f0047f448dc3327b974ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Fri, 28 May 2021 17:44:29 +0200 Subject: [PATCH] Fix bug #81088 error in regression test for oci_fetch_object() and oci_fetch_array() --- ext/oci8/oci8.stub.php | 4 ++-- ext/oci8/oci8_arginfo.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/oci8/oci8.stub.php b/ext/oci8/oci8.stub.php index 330c445b7b950..682e27fbc68d9 100644 --- a/ext/oci8/oci8.stub.php +++ b/ext/oci8/oci8.stub.php @@ -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 {} diff --git a/ext/oci8/oci8_arginfo.h b/ext/oci8/oci8_arginfo.h index 2eba00ade71e2..c4c487c5f095e 100644 --- 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: 7355ccbef6b490db7ddec94d485fbfb4597c3150 */ + * Stub hash: 8dc5574739b6e6c099aecb06c239235d33eaea9f */ 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