mirror of
https://github.com/php/php-src.git
synced 2024-11-23 18:04:36 +08:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix the default value of $fetchMode in PDO::pgsqlGetNotify()
This commit is contained in:
commit
b500ddd7a9
3
NEWS
3
NEWS
@ -31,6 +31,9 @@ PHP NEWS
|
||||
. Fixed JIT bug (JIT emits "Attempt to assign property of non-object"
|
||||
warning at the same time as Error is being thrown). (Girgias)
|
||||
|
||||
- PDO PGSQL:
|
||||
. Fixed the default value of $fetchMode in PDO::pgsqlGetNotify() (kocsismate)
|
||||
|
||||
- SOAP:
|
||||
. Fixed bug GH-12838 ([SOAP] Temporary WSDL cache files not being deleted).
|
||||
(nielsdos)
|
||||
|
@ -29,7 +29,7 @@ class PDO_PGSql_Ext {
|
||||
public function pgsqlLOBUnlink(string $oid): bool {}
|
||||
|
||||
/** @tentative-return-type */
|
||||
public function pgsqlGetNotify(int $fetchMode = PDO::FETCH_USE_DEFAULT, int $timeoutMilliseconds = 0): array|false {}
|
||||
public function pgsqlGetNotify(int $fetchMode = PDO::FETCH_DEFAULT, int $timeoutMilliseconds = 0): array|false {}
|
||||
|
||||
/** @tentative-return-type */
|
||||
public function pgsqlGetPid(): int {}
|
||||
|
4
ext/pdo_pgsql/pgsql_driver_arginfo.h
generated
4
ext/pdo_pgsql/pgsql_driver_arginfo.h
generated
@ -1,5 +1,5 @@
|
||||
/* This is a generated file, edit the .stub.php file instead.
|
||||
* Stub hash: b30fa6327876dc1090ee5397253c935e4566a8fe */
|
||||
* Stub hash: 9bb79af98dbb7c171fd9533aeabece4937a06cd2 */
|
||||
|
||||
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDO_PGSql_Ext_pgsqlCopyFromArray, 0, 2, _IS_BOOL, 0)
|
||||
ZEND_ARG_TYPE_INFO(0, tableName, IS_STRING, 0)
|
||||
@ -39,7 +39,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_PDO_PGSql_Ext_pg
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_PDO_PGSql_Ext_pgsqlGetNotify, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
|
||||
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fetchMode, IS_LONG, 0, "PDO::FETCH_USE_DEFAULT")
|
||||
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fetchMode, IS_LONG, 0, "PDO::FETCH_DEFAULT")
|
||||
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeoutMilliseconds, IS_LONG, 0, "0")
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user