diff options
Diffstat (limited to 'ext/sqlite3')
| -rw-r--r-- | ext/sqlite3/php_sqlite3_structs.h | 2 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 8 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.stub.php | 5 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3_arginfo.h | 2 | ||||
| -rw-r--r-- | ext/sqlite3/tests/sqlite3_busyTimeout.phpt | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/ext/sqlite3/php_sqlite3_structs.h b/ext/sqlite3/php_sqlite3_structs.h index 80e915da68..07b0c8ba95 100644 --- a/ext/sqlite3/php_sqlite3_structs.h +++ b/ext/sqlite3/php_sqlite3_structs.h @@ -74,7 +74,7 @@ typedef struct _php_sqlite3_db_object { zend_fcall_info authorizer_fci; zend_fcall_info_cache authorizer_fcc; - zend_bool exception; + bool exception; zend_llist free_list; zend_object zo; diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index cd91e68fd3..cfd0cb7eae 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -306,7 +306,7 @@ PHP_METHOD(SQLite3, enableExtendedResultCodes) { php_sqlite3_db_object *db_obj; zval *object = ZEND_THIS; - zend_bool enable = 1; + bool enable = 1; db_obj = Z_SQLITE3_DB_P(object); int ret; @@ -660,7 +660,7 @@ PHP_METHOD(SQLite3, querySingle) zend_string *sql; char *errtext = NULL; int return_code; - zend_bool entire_row = 0; + bool entire_row = 0; sqlite3_stmt *stmt; db_obj = Z_SQLITE3_DB_P(object); @@ -1281,7 +1281,7 @@ PHP_METHOD(SQLite3, enableExceptions) { php_sqlite3_db_object *db_obj; zval *object = ZEND_THIS; - zend_bool enableExceptions = 0; + bool enableExceptions = 0; db_obj = Z_SQLITE3_DB_P(object); @@ -1607,7 +1607,7 @@ static int php_sqlite3_bind_params(php_sqlite3_stmt *stmt_obj) /* {{{ */ PHP_METHOD(SQLite3Stmt, getSQL) { php_sqlite3_stmt *stmt_obj; - zend_bool expanded = 0; + bool expanded = 0; zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); int bind_rc; diff --git a/ext/sqlite3/sqlite3.stub.php b/ext/sqlite3/sqlite3.stub.php index 95bfb312d8..b4d4fdce29 100644 --- a/ext/sqlite3/sqlite3.stub.php +++ b/ext/sqlite3/sqlite3.stub.php @@ -4,7 +4,10 @@ class SQLite3 { - /** @implementation-alias SQLite3::open */ + /** + * @implementation-alias SQLite3::open + * @no-verify SQLite3::open should really be static + */ public function __construct(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryptionKey = "") {} /** @return void */ diff --git a/ext/sqlite3/sqlite3_arginfo.h b/ext/sqlite3/sqlite3_arginfo.h index 39e026c52d..8f95c54d8f 100644 --- a/ext/sqlite3/sqlite3_arginfo.h +++ b/ext/sqlite3/sqlite3_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 61a684b6c221a15538a5f8cc32bc4e7d4cf3c8fd */ + * Stub hash: 2abe77016e7a595f1687be34e52bba6aa477e7ae */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) diff --git a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt index ea97d8ee00..e27235a6af 100644 --- a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt +++ b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt @@ -8,7 +8,6 @@ marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br <?php require_once(__DIR__ . '/new_db.inc'); var_dump($db->busyTimeout(0)); -var_dump($db->busyTimeout(null)); var_dump($db->busyTimeout(-1000)); var_dump($db->busyTimeout(1000)); $db->close(); @@ -17,4 +16,3 @@ $db->close(); bool(true) bool(true) bool(true) -bool(true) |