From ffb1a1f32cebe184c4b87ef3b802e19be17d1773 Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Sat, 18 Mar 2023 21:41:50 +0000
Subject: [PATCH] ext/sqlite3: SQLite3::close, SQLite3Stmt::close and
 SQLite3Result::finalize changed from bool return value to void.

---
 UPGRADING                                              |  4 ++++
 ext/sqlite3/sqlite3.c                                  |  6 ------
 ext/sqlite3/sqlite3.stub.php                           | 10 +++++-----
 ext/sqlite3/sqlite3_arginfo.h                          |  9 +++++----
 ext/sqlite3/tests/bug47159.phpt                        |  6 ++----
 ext/sqlite3/tests/bug69972.phpt                        |  3 +--
 ext/sqlite3/tests/sqlite3_01_open-mb.phpt              |  3 +--
 ext/sqlite3/tests/sqlite3_01_open.phpt                 |  3 +--
 ext/sqlite3/tests/sqlite3_02_create.phpt               |  3 +--
 ext/sqlite3/tests/sqlite3_03_insert.phpt               |  3 +--
 ext/sqlite3/tests/sqlite3_04_update.phpt               |  3 +--
 ext/sqlite3/tests/sqlite3_05_delete.phpt               |  3 +--
 ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt        |  3 +--
 ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt        |  3 +--
 ext/sqlite3/tests/sqlite3_08_udf.phpt                  |  3 +--
 ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt     |  6 ++----
 ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3_11_numrows.phpt              |  3 +--
 .../tests/sqlite3_12_unfinalized_stmt_cleanup.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3_16_select_no_results.phpt    |  3 +--
 ext/sqlite3/tests/sqlite3_18_changes.phpt              |  3 +--
 ext/sqlite3/tests/sqlite3_19_columninfo.phpt           |  3 +--
 ext/sqlite3/tests/sqlite3_20_error.phpt                |  3 +--
 ext/sqlite3/tests/sqlite3_21_security.phpt             |  3 +--
 ext/sqlite3/tests/sqlite3_22_loadextension.phpt        |  3 +--
 ext/sqlite3/tests/sqlite3_23_escape_string.phpt        |  3 +--
 ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt    |  3 +--
 ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt  |  3 +--
 .../tests/sqlite3_27_reset_prepared_stmt_result.phpt   |  3 +--
 ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt       |  3 +--
 ext/sqlite3/tests/sqlite3_30_blobopen.phpt             |  6 ++----
 ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt        |  3 +--
 ext/sqlite3/tests/sqlite3_38_extended_error.phpt       |  3 +--
 ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt       |  3 +--
 ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt      |  3 +--
 ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3_enable_exceptions.phpt       |  3 +--
 .../tests/sqlite3_trampoline_create_aggregate.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3stmt_getsql.phpt              |  3 +--
 ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt     |  3 +--
 ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt    |  3 +--
 42 files changed, 55 insertions(+), 97 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 210215c3fab7e..28eb4456b1f71 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -102,6 +102,10 @@ PHP 8.3 UPGRADE NOTES
     argument is non empty with the class not having constructor.
   . pg_insert now raises a ValueError instead of a WARNING when the table specified is invalid.
 
+- Sqlite:
+  . SQLite3::close, SQLite3Result::finalize and SQLite3Stmt::close are void.
+    Previously, they always returned true.
+
 - Standard:
   . E_NOTICEs emitted by unserialized() have been promoted to E_WARNING.
     RFC: https://wiki.php.net/rfc/improve_unserialize_error_handling
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 2b8cbe33dd94e..16015b0fe05c0 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -194,8 +194,6 @@ PHP_METHOD(SQLite3, close)
 		}
 		db_obj->initialised = 0;
 	}
-
-	RETURN_TRUE;
 }
 /* }}} */
 
@@ -1418,8 +1416,6 @@ PHP_METHOD(SQLite3Stmt, close)
 	if(stmt_obj->db_obj) {
 		zend_llist_del_element(&(stmt_obj->db_obj->free_list), object, (int (*)(void *, void *)) php_sqlite3_compare_stmt_zval_free);
 	}
-
-	RETURN_TRUE;
 }
 /* }}} */
 
@@ -2052,8 +2048,6 @@ PHP_METHOD(SQLite3Result, finalize)
 	} else {
 		sqlite3_reset(result_obj->stmt_obj->stmt);
 	}
-
-	RETURN_TRUE;
 }
 /* }}} */
 
diff --git a/ext/sqlite3/sqlite3.stub.php b/ext/sqlite3/sqlite3.stub.php
index 639a5fb782fc7..066e1baedeb35 100644
--- a/ext/sqlite3/sqlite3.stub.php
+++ b/ext/sqlite3/sqlite3.stub.php
@@ -311,8 +311,8 @@ public function __construct(string $filename, int $flags = SQLITE3_OPEN_READWRIT
     /** @tentative-return-type */
     public function open(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryptionKey = ""): void {}
 
-    /** @return bool */
-    public function close() {} // TODO make return type void
+    /** @tentative-return-type */
+    public function close(): void {}
 
     /** @tentative-return-type */
     public static function version(): array {}
@@ -397,7 +397,7 @@ public function bindValue(string|int $param, mixed $value, int $type = SQLITE3_T
     public function clear(): bool {}
 
     /** @tentative-return-type */
-    public function close(): bool {}
+    public function close(): void {}
 
     /** @tentative-return-type */
     public function execute(): SQLite3Result|false {}
@@ -435,6 +435,6 @@ public function fetchArray(int $mode = SQLITE3_BOTH): array|false {}
     /** @tentative-return-type */
     public function reset(): bool {}
 
-    /** @return bool */
-    public function finalize() {} // TODO make return type void
+    /** @tentative-return-type */
+    public function finalize(): void {}
 }
diff --git a/ext/sqlite3/sqlite3_arginfo.h b/ext/sqlite3/sqlite3_arginfo.h
index b99134ed1f24b..cdf46d4d5b44a 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: 61f4a2611ed8cef37003610991e357b0f227bec9 */
+ * Stub hash: 60a2bfc260dbadaa376cfb3db54e7851a98cdc3b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -13,7 +13,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SQLite3_open, 0,
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encryptionKey, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_close, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SQLite3_close, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SQLite3_version, 0, 0, IS_ARRAY, 0)
@@ -129,7 +129,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SQLite3Stmt_clear, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_SQLite3Stmt_close arginfo_class_SQLite3Stmt_clear
+#define arginfo_class_SQLite3Stmt_close arginfo_class_SQLite3_close
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_SQLite3Stmt_execute, 0, 0, SQLite3Result, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
@@ -144,7 +144,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_SQLite3Stmt_reset arginfo_class_SQLite3Stmt_clear
 
-#define arginfo_class_SQLite3Result___construct arginfo_class_SQLite3_close
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Result___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_SQLite3Result_numColumns arginfo_class_SQLite3_lastInsertRowID
 
diff --git a/ext/sqlite3/tests/bug47159.phpt b/ext/sqlite3/tests/bug47159.phpt
index 21db694e98170..12cca5a35fad9 100644
--- a/ext/sqlite3/tests/bug47159.phpt
+++ b/ext/sqlite3/tests/bug47159.phpt
@@ -9,14 +9,12 @@ require_once(__DIR__ . '/new_db.inc');
 
 $stmt = $db->prepare("SELECT 1");
 
-var_dump($stmt->close());
+$stmt->close();
 
-var_dump($db->close());
+$db->close();
 
 print "done";
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
 done
diff --git a/ext/sqlite3/tests/bug69972.phpt b/ext/sqlite3/tests/bug69972.phpt
index 3c926a11ab5bb..d2afab19a3245 100644
--- a/ext/sqlite3/tests/bug69972.phpt
+++ b/ext/sqlite3/tests/bug69972.phpt
@@ -8,7 +8,7 @@ $db = new SQLite3(':memory:');
 echo "SELECTING from invalid table\n";
 $result = $db->query("SELECT * FROM non_existent_table");
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 
 // Trigger the use-after-free
@@ -20,7 +20,6 @@ SELECTING from invalid table
 
 Warning: SQLite3::query(): Unable to prepare statement: 1, no such table: non_existent_table in %sbug69972.php on line %d
 Closing database
-bool(true)
 Done
 Error Code: 0
 Error Msg:
diff --git a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
index 82f8256ac62d7..097ce6d6638f4 100644
--- a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
+++ b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
@@ -10,7 +10,7 @@ $db = new SQLite3($db_file);
 //require_once(__DIR__ . '/new_db.inc');
 
 var_dump($db);
-var_dump($db->close());
+$db->close();
 
 unlink($db_file);
 echo "Done\n";
@@ -18,5 +18,4 @@ echo "Done\n";
 --EXPECTF--
 object(SQLite3)#%d (0) {
 }
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_01_open.phpt b/ext/sqlite3/tests/sqlite3_01_open.phpt
index 3dea5f5428bae..953a21daa66bf 100644
--- a/ext/sqlite3/tests/sqlite3_01_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_01_open.phpt
@@ -8,11 +8,10 @@ sqlite3
 require_once(__DIR__ . '/new_db.inc');
 
 var_dump($db);
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
 object(SQLite3)#%d (0) {
 }
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_02_create.phpt b/ext/sqlite3/tests/sqlite3_02_create.phpt
index afe7dcf49d23d..d76f935eaa102 100644
--- a/ext/sqlite3/tests/sqlite3_02_create.phpt
+++ b/ext/sqlite3/tests/sqlite3_02_create.phpt
@@ -17,7 +17,7 @@ echo "Dropping database\n";
 var_dump($db->exec('DROP TABLE test'));
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -30,5 +30,4 @@ bool(false)
 Dropping database
 bool(true)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_03_insert.phpt b/ext/sqlite3/tests/sqlite3_03_insert.phpt
index 190ec5fe88084..ad4df8924aed2 100644
--- a/ext/sqlite3/tests/sqlite3_03_insert.phpt
+++ b/ext/sqlite3/tests/sqlite3_03_insert.phpt
@@ -24,7 +24,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
   string(1) "b"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_04_update.phpt b/ext/sqlite3/tests/sqlite3_04_update.phpt
index 66077489040ae..3b68e65dd1752 100644
--- a/ext/sqlite3/tests/sqlite3_04_update.phpt
+++ b/ext/sqlite3/tests/sqlite3_04_update.phpt
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -73,5 +73,4 @@ array(2) {
   string(1) "c"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_05_delete.phpt b/ext/sqlite3/tests/sqlite3_05_delete.phpt
index a256c38dc4c7e..0b6f48f035632 100644
--- a/ext/sqlite3/tests/sqlite3_05_delete.phpt
+++ b/ext/sqlite3/tests/sqlite3_05_delete.phpt
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -67,5 +67,4 @@ array(2) {
   string(1) "b"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
index 611e4ea940c21..3130a92cb9c83 100644
--- a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
@@ -29,7 +29,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -48,5 +48,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
index 380ffd9e73bfb..71f16b53da3f7 100644
--- a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
@@ -28,7 +28,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_08_udf.phpt b/ext/sqlite3/tests/sqlite3_08_udf.phpt
index 896b2f192ee9c..2330f7c02d190 100644
--- a/ext/sqlite3/tests/sqlite3_08_udf.phpt
+++ b/ext/sqlite3/tests/sqlite3_08_udf.phpt
@@ -32,7 +32,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -53,5 +53,4 @@ array(1) {
   string(32) "92eb5ffee6ae2fec3ad71c777531578f"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
index c1d07d12e7703..37406e642f520 100644
--- a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
@@ -24,7 +24,7 @@ var_dump($insert_stmt->bindValue(1, 'a', SQLITE3_TEXT));
 var_dump($insert_stmt->bindParam(2, $foo, SQLITE3_BLOB));
 $insert_stmt->execute();
 echo "Closing statement\n";
-var_dump($insert_stmt->close());
+$insert_stmt->close();
 
 echo "SELECTING results\n";
 $results = $db->query("SELECT id, quote(data) AS data FROM test ORDER BY id ASC");
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -48,7 +48,6 @@ BINDING Parameter
 bool(true)
 bool(true)
 Closing statement
-bool(true)
 SELECTING results
 array(2) {
   [0]=>
@@ -57,5 +56,4 @@ array(2) {
   string(23) "X'61626364656667006869'"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
index 7e2b8779811ef..10a104c66df0c 100644
--- a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
+++ b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
@@ -30,7 +30,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -51,5 +51,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
index 29faea68f8eb2..69bb6d093e67b 100644
--- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt
+++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
@@ -31,7 +31,7 @@ var_dump($results->numRows());
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -44,5 +44,4 @@ SELECTING results
 Number of rows
 int(2)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
index 67037e22695e4..8c03e7c34860c 100644
--- a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
+++ b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
@@ -25,7 +25,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 }
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Check db was closed\n";
 try {
     var_dump($results->numColumns());
@@ -48,7 +48,6 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Check db was closed
 The SQLite3Result object has not been correctly initialised or is already closed
 Done
diff --git a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
index ae0e98002a325..77fbf83724e09 100644
--- a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
+++ b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
@@ -20,7 +20,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -28,5 +28,4 @@ Creating Table
 bool(true)
 SELECTING results
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_18_changes.phpt b/ext/sqlite3/tests/sqlite3_18_changes.phpt
index de0baae695e4d..3925de1aaabdd 100644
--- a/ext/sqlite3/tests/sqlite3_18_changes.phpt
+++ b/ext/sqlite3/tests/sqlite3_18_changes.phpt
@@ -22,7 +22,7 @@ echo "Rows Updated\n";
 var_dump($db->changes());
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -36,5 +36,4 @@ bool(true)
 Rows Updated
 int(2)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
index 3548de5342340..63926f4a8c52f 100644
--- a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
+++ b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
@@ -26,7 +26,7 @@ while ($row = $result->fetchArray(SQLITE3_NUM)) {
 $result->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -41,5 +41,4 @@ Name: id - Type: 3
 Name: time - Type: 1
 Name: id - Type: 3
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_20_error.phpt b/ext/sqlite3/tests/sqlite3_20_error.phpt
index f5fb9a890c064..35021ce997f08 100644
--- a/ext/sqlite3/tests/sqlite3_20_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_20_error.phpt
@@ -14,7 +14,7 @@ if (!$result) {
     echo "Error Msg: " . $db->lastErrorMsg() . "\n";
 }
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -24,5 +24,4 @@ Warning: SQLite3::query(): Unable to prepare statement: 1, no such table: non_ex
 Error Code: 1
 Error Msg: no such table: non_existent_table
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt
index c3a22654ce5bf..1d07c5069e030 100644
--- a/ext/sqlite3/tests/sqlite3_21_security.phpt
+++ b/ext/sqlite3/tests/sqlite3_21_security.phpt
@@ -14,7 +14,7 @@ $file = uniqid() . '.db';
 echo "Within test directory\n";
 $db = new SQLite3($directory . $file);
 var_dump($db);
-var_dump($db->close());
+$db->close();
 unlink($directory . $file);
 
 echo "Above test directory\n";
@@ -30,7 +30,6 @@ echo "Done\n";
 Within test directory
 object(SQLite3)#%d (0) {
 }
-bool(true)
 Above test directory
 
 Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %ssqlite3_21_security.php on line %d
diff --git a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
index cdc7f4d4dc6ea..daa2bf6935322 100644
--- a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
+++ b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
@@ -22,7 +22,7 @@ $directory = __DIR__;
 touch($directory . '/myext.txt');
 
 var_dump($db->loadExtension('myext.txt'));
-var_dump($db->close());
+$db->close();
 unlink($directory . '/myext.txt');
 
 echo "Done\n";
@@ -30,5 +30,4 @@ echo "Done\n";
 --EXPECTF--
 Warning: SQLite3::loadExtension(): Unable to load extension at '.%emyext.txt' in %s on line %d
 bool(false)
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
index 44ce5b2194f89..11358b62e8031 100644
--- a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
@@ -24,7 +24,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
   string(7) "test''%"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
index d52856c4a1b97..586742f208803 100644
--- a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
+++ b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
@@ -18,7 +18,7 @@ var_dump($db->exec("INSERT INTO test (time, id) VALUES (" . TIMENOW . ", 'b')"))
 var_dump($db->lastInsertRowID());
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -30,5 +30,4 @@ int(1)
 bool(true)
 int(2)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
index a7c639a2b4345..24d32f0c15d78 100644
--- a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
+++ b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
@@ -36,7 +36,7 @@ $db->createAggregate('S', 'sum_list_step', 'sum_list_finalize', 1);
 print_r($db->querySingle("SELECT S(a), S(b) FROM test", true));
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -54,5 +54,4 @@ Array
     [S(b)] => -1,-3,-6,-10,-14
 )
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
index 882d8f6b0be2b..f7a540dc05142 100644
--- a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
@@ -32,7 +32,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM)) {
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -57,5 +57,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
index 26ed7bdbbeed1..3e9eabda49619 100644
--- a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
+++ b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
@@ -32,7 +32,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM)) {
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -57,5 +57,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
index ed4a27c714f87..67881d1c976ae 100644
--- a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
+++ b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM)) {
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -61,5 +61,4 @@ array(2) {
   string(1) "b"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
index 6937dcd927f27..c23705dbe2abb 100644
--- a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
+++ b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
@@ -20,7 +20,7 @@ var_dump($insert_stmt->bindValue(1, 'a', SQLITE3_TEXT));
 var_dump($insert_stmt->bindValue(2, 'TEST TEST', SQLITE3_BLOB));
 $insert_stmt->execute();
 echo "Closing statement\n";
-var_dump($insert_stmt->close());
+$insert_stmt->close();
 $stream = $db->openBlob('test', 'data', 1);
 var_dump($stream);
 echo "Stream Contents\n";
@@ -42,7 +42,7 @@ var_dump(fwrite($stream, 'ABCD ABCD ABCD'));
 echo "Closing Stream\n";
 var_dump(fclose($stream));
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -53,7 +53,6 @@ BINDING Parameter
 bool(true)
 bool(true)
 Closing statement
-bool(true)
 resource(%d) of type (stream)
 Stream Contents
 string(9) "TEST TEST"
@@ -76,5 +75,4 @@ bool(false)
 Closing Stream
 bool(true)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
index 49f029d5854f6..a292c2caf5e70 100644
--- a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
+++ b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
@@ -35,7 +35,7 @@ $stmt = $db->prepare("DELETE FROM test");
 var_dump($stmt->readOnly());
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -51,5 +51,4 @@ bool(false)
 Checking delete statement
 bool(false)
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
index 433e1efce0475..9c7e4b4357c83 100644
--- a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
@@ -19,7 +19,7 @@ echo "Second Error Code: " . $db->lastErrorCode() . PHP_EOL;
 echo "Second Extended Error Code: " . $db->lastExtendedErrorCode() . PHP_EOL;
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done" . PHP_EOL;
 ?>
 --EXPECTF--
@@ -31,6 +31,5 @@ Warning: SQLite3::query(): Unable to execute statement: UNIQUE constraint failed
 Second Error Code: 19
 Second Extended Error Code: 1555
 Closing database
-bool(true)
 Done
 
diff --git a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
index 135c1cdd10953..20ce448e245af 100644
--- a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
+++ b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
@@ -23,7 +23,7 @@ $result = $db->query("INSERT INTO DOG VALUES (1, 'Annoying Dog', 1)");
 echo "Third (Extended) Error Code: " . $db->lastErrorCode() . PHP_EOL;
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done" . PHP_EOL;
 ?>
 --EXPECTF--
@@ -38,6 +38,5 @@ Toggling extended error codes and re-inserting a third time
 Warning: SQLite3::query(): Unable to execute statement: UNIQUE constraint failed: dog.id in %s on line %d
 Third (Extended) Error Code: 1555
 Closing database
-bool(true)
 Done
 
diff --git a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
index e6c774d6f0777..5a04c29d27652 100644
--- a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
+++ b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
@@ -26,7 +26,7 @@ $f = fopen("hello://there", "r");
 var_dump($insert_stmt->bindParam(1, $f, SQLITE3_BLOB));
 var_dump($insert_stmt->execute());
 
-var_dump($insert_stmt->close());
+$insert_stmt->close();
 fclose($f);
 
 ?>
@@ -36,5 +36,4 @@ bool(true)
 bool(true)
 object(SQLite3Result)#%d (%d) {
 }
-bool(true)
 +++DONE+++
diff --git a/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt b/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
index 8e5b1cd68eb66..ad34e19a06b35 100644
--- a/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
+++ b/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
@@ -28,7 +28,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
 $results->finalize();
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
   string(1) "a"
 }
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
index 0199b798e020e..4d9f645d2bc4c 100644
--- a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
+++ b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
@@ -18,7 +18,7 @@ try{
 var_dump($db->enableExceptions(false));
 $db->query("SELECT * FROM non_existent_table");
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -28,5 +28,4 @@ bool(true)
 
 Warning: SQLite3::query(): no such table: non_existent_table in %s on line %d
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3_trampoline_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_trampoline_create_aggregate.phpt
index cda9eee278f0f..68ce9e97e4918 100644
--- a/ext/sqlite3/tests/sqlite3_trampoline_create_aggregate.phpt
+++ b/ext/sqlite3/tests/sqlite3_trampoline_create_aggregate.phpt
@@ -41,7 +41,7 @@ $db->createAggregate('S', $step, $finalize, 1);
 print_r($db->querySingle("SELECT S(a), S(b) FROM test", true));
 
 echo "Closing database\n";
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -71,5 +71,4 @@ Array
     [S(b)] => -1,-3,-6,-10,-14
 )
 Closing database
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
index c45e724242d16..d52ff6d6796c2 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
@@ -25,7 +25,7 @@ echo "Statement result\n";
 var_dump($res->fetchArray(SQLITE3_NUM));
 
 echo "Closing DB\n";
-var_dump($db->close());
+$db->close();
 
 echo "Done\n";
 ?>
@@ -45,5 +45,4 @@ array(3) {
   int(43)
 }
 Closing DB
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
index 7ab3019f7bddb..bc5d49bd765d8 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
@@ -41,7 +41,7 @@ echo "Getting expanded SQL statement\n";
 var_dump($stmt->getSQL(true));
 
 echo "Closing DB\n";
-var_dump($db->close());
+$db->close();
 
 echo "Done\n";
 ?>
@@ -64,5 +64,4 @@ Change binded values
 Getting expanded SQL statement
 string(25) "SELECT 'TEST', '!!!', 40;"
 Closing DB
-bool(true)
 Done
diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
index e6148ce611258..70133bc14d61a 100644
--- a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
@@ -36,7 +36,7 @@ foreach($queryArray as $key => $query) {
 echo "Closing database\n";
 $stmt = null;
 $result = null;
-var_dump($db->close());
+$db->close();
 echo "Done\n";
 ?>
 --EXPECT--
@@ -55,5 +55,4 @@ int(2)
 Param count for query 4:
 int(1)
 Closing database
-bool(true)
 Done