Skip to content

Commit 9b269df

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: SQLite3::query() cannot return null
2 parents f91ece0 + abe23bd commit 9b269df

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/sqlite3/sqlite3.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function prepare(string $query) {}
5353
/** @return bool */
5454
public function exec(string $query) {}
5555

56-
/** @return SQLite3Result|false|null */
56+
/** @return SQLite3Result|false */
5757
public function query(string $query) {}
5858

5959
/** @return mixed */

ext/sqlite3/sqlite3_arginfo.h

Lines changed: 1 addition & 1 deletion
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: 20d9cd75afa2a9b9d4eb6c8019e7c47d34778df4 */
2+
* Stub hash: 61a684b6c221a15538a5f8cc32bc4e7d4cf3c8fd */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)

0 commit comments

Comments
 (0)