Skip to content

Commit f073663

Browse files
committed
Fix some types in ext/oci8
Closes phpGH-6992
1 parent a75a4a4 commit f073663

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ext/oci8/oci8.stub.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ function oci_bind_by_name($statement, string $param, mixed &$var, int $max_lengt
2222
*/
2323
function ocibindbyname($statement, string $param, mixed &$var, int $max_length = -1, int $type = 0): bool {}
2424

25-
/** @param resource $statement */
26-
function oci_bind_array_by_name($statement, string $param, mixed &$var, int $max_array_length, int $max_item_length = -1, int $type = SQLT_AFC): bool {}
25+
/**
26+
* @param resource $statement
27+
* @param array $var
28+
*/
29+
function oci_bind_array_by_name($statement, string $param, &$var, int $max_array_length, int $max_item_length = -1, int $type = SQLT_AFC): bool {}
2730

2831
function oci_free_descriptor(OCILob $lob): bool {}
2932

@@ -247,7 +250,7 @@ function oci_fetch_all($statement, &$output, int $offset = 0, int $limit = -1, i
247250
function ocifetchstatement($statement, &$output, int $offset = 0, int $limit = -1, int $flags = 0): int {}
248251

249252
/** @param resource $statement */
250-
function oci_fetch_object($statement, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|null|false {}
253+
function oci_fetch_object($statement, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|false {}
251254

252255
/** @param resource $statement */
253256
function oci_fetch_row($statement): array|false {}

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: e7a7a9402b2668136f9f47d6e547e3af46a78a50 */
2+
* Stub hash: 7355ccbef6b490db7ddec94d485fbfb4597c3150 */
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)
@@ -23,7 +23,7 @@ ZEND_END_ARG_INFO()
2323
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_bind_array_by_name, 0, 4, _IS_BOOL, 0)
2424
ZEND_ARG_INFO(0, statement)
2525
ZEND_ARG_TYPE_INFO(0, param, IS_STRING, 0)
26-
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
26+
ZEND_ARG_INFO(1, var)
2727
ZEND_ARG_TYPE_INFO(0, max_array_length, IS_LONG, 0)
2828
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_item_length, IS_LONG, 0, "-1")
2929
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "SQLT_AFC")
@@ -221,7 +221,7 @@ ZEND_END_ARG_INFO()
221221

222222
#define arginfo_ocifetchstatement arginfo_oci_fetch_all
223223

224-
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_fetch_object, 0, 1, stdClass, MAY_BE_NULL|MAY_BE_FALSE)
224+
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)
226226
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS")
227227
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)