diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 09:49:52 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 09:49:52 +0100 |
| commit | 756261cf9a85d400587bede611156ebd104f582b (patch) | |
| tree | a2c2f420c30b58812230679b7a71e0aebb525fc4 | |
| parent | 1126b8a0626971dae7c57d31f34711e8f48f8aa2 (diff) | |
| parent | 4bbb98c24fa691c176e403ab00a2fe3dd4224b3e (diff) | |
| download | php-git-756261cf9a85d400587bede611156ebd104f582b.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix PDOStatement::fetchObject() stub
| -rw-r--r-- | ext/pdo/pdo_stmt.stub.php | 2 | ||||
| -rw-r--r-- | ext/pdo/pdo_stmt_arginfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo/pdo_stmt.stub.php b/ext/pdo/pdo_stmt.stub.php index 06d6a557e7..ab3ab6a42f 100644 --- a/ext/pdo/pdo_stmt.stub.php +++ b/ext/pdo/pdo_stmt.stub.php @@ -40,7 +40,7 @@ class PDOStatement implements IteratorAggregate /** @return mixed */ public function fetchColumn(int $column = 0) {} - /** @return mixed */ + /** @return object|false */ public function fetchObject(?string $class = "stdClass", ?array $ctorArgs = null) {} /** @return mixed */ diff --git a/ext/pdo/pdo_stmt_arginfo.h b/ext/pdo/pdo_stmt_arginfo.h index 9e7eea4c3b..25858477eb 100644 --- a/ext/pdo/pdo_stmt_arginfo.h +++ b/ext/pdo/pdo_stmt_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 574055f1dbb6a1bee10e4476642a759e53ca2802 */ + * Stub hash: 9d890849a08b43cb35e2cd8468aeaabfc0a7f218 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDOStatement_bindColumn, 0, 0, 2) ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL) |