Skip to content

Commit 8bbdbd0

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fixed bug #74413 wrong reflection on SQLite3::enableExceptions
2 parents d44eaca + b74b325 commit 8bbdbd0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ PHP NEWS
153153
- PDO_OCI:
154154
. Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated). (gureedo / Oracle)
155155

156+
- SQLite3:
157+
. Fixed bug #74413 (incorrect reflection for SQLite3::enableExceptions).
158+
(krakjoe)
159+
156160
- Standard:
157161
. Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
158162
(Anatol)

ext/sqlite3/sqlite3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,7 @@ ZEND_BEGIN_ARG_INFO_EX(argingo_sqlite3_openblob, 0, 0, 3)
19171917
ZEND_ARG_INFO(0, dbname)
19181918
ZEND_END_ARG_INFO()
19191919

1920-
ZEND_BEGIN_ARG_INFO_EX(argingo_sqlite3_enableexceptions, 0, 0, 1)
1920+
ZEND_BEGIN_ARG_INFO_EX(argingo_sqlite3_enableexceptions, 0, 0, 0)
19211921
ZEND_ARG_INFO(0, enableExceptions)
19221922
ZEND_END_ARG_INFO()
19231923

0 commit comments

Comments
 (0)