Skip to content

Commit 66aae9d

Browse files
devnexendevnexen
committed
ext/sqlite3: SQLite3::close, SQLite3Stmt::close and SQLite3Result::finalize
changed from bool return value to void.
1 parent 674bcca commit 66aae9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+54
-95
lines changed

‎UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ PHP 8.3 UPGRADE NOTES
102102
argument is non empty with the class not having constructor.
103103
. pg_insert now raises a ValueError instead of a WARNING when the table specified is invalid.
104104

105+
- Sqlite:
106+
. SQLite3::close, SQLite3Result::finalize and SQLite3Stmt::close are void.
107+
Previously, they returned bool.
108+
105109
- Standard:
106110
. E_NOTICEs emitted by unserialized() have been promoted to E_WARNING.
107111
RFC: https://wiki.php.net/rfc/improve_unserialize_error_handling

‎ext/sqlite3/sqlite3.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ PHP_METHOD(SQLite3, close)
194194
}
195195
db_obj->initialised = 0;
196196
}
197-
198-
RETURN_TRUE;
199197
}
200198
/* }}} */
201199

@@ -1418,8 +1416,6 @@ PHP_METHOD(SQLite3Stmt, close)
14181416
if(stmt_obj->db_obj) {
14191417
zend_llist_del_element(&(stmt_obj->db_obj->free_list), object, (int (*)(void *, void *)) php_sqlite3_compare_stmt_zval_free);
14201418
}
1421-
1422-
RETURN_TRUE;
14231419
}
14241420
/* }}} */
14251421

@@ -2052,8 +2048,6 @@ PHP_METHOD(SQLite3Result, finalize)
20522048
} else {
20532049
sqlite3_reset(result_obj->stmt_obj->stmt);
20542050
}
2055-
2056-
RETURN_TRUE;
20572051
}
20582052
/* }}} */
20592053

‎ext/sqlite3/sqlite3.stub.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public function __construct(string $filename, int $flags = SQLITE3_OPEN_READWRIT
312312
public function open(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryptionKey = ""): void {}
313313

314314
/** @return bool */
315-
public function close() {} // TODO make return type void
315+
public function close(): void {}
316316

317317
/** @tentative-return-type */
318318
public static function version(): array {}
@@ -397,7 +397,7 @@ public function bindValue(string|int $param, mixed $value, int $type = SQLITE3_T
397397
public function clear(): bool {}
398398

399399
/** @tentative-return-type */
400-
public function close(): bool {}
400+
public function close(): void {}
401401

402402
/** @tentative-return-type */
403403
public function execute(): SQLite3Result|false {}
@@ -436,5 +436,5 @@ public function fetchArray(int $mode = SQLITE3_BOTH): array|false {}
436436
public function reset(): bool {}
437437

438438
/** @return bool */
439-
public function finalize() {} // TODO make return type void
439+
public function finalize(): void {}
440440
}

‎ext/sqlite3/sqlite3_arginfo.h

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/sqlite3/tests/bug47159.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ require_once(__DIR__ . '/new_db.inc');
99

1010
$stmt = $db->prepare("SELECT 1");
1111

12-
var_dump($stmt->close());
12+
$stmt->close();
1313

14-
var_dump($db->close());
14+
$db->close();
1515

1616
print "done";
1717

1818
?>
1919
--EXPECT--
20-
bool(true)
21-
bool(true)
2220
done

‎ext/sqlite3/tests/bug69972.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $db = new SQLite3(':memory:');
88
echo "SELECTING from invalid table\n";
99
$result = $db->query("SELECT * FROM non_existent_table");
1010
echo "Closing database\n";
11-
var_dump($db->close());
11+
$db->close();
1212
echo "Done\n";
1313

1414
// Trigger the use-after-free
@@ -20,7 +20,6 @@ SELECTING from invalid table
2020

2121
Warning: SQLite3::query(): Unable to prepare statement: 1, no such table: non_existent_table in %sbug69972.php on line %d
2222
Closing database
23-
bool(true)
2423
Done
2524
Error Code: 0
2625
Error Msg:

‎ext/sqlite3/tests/sqlite3_01_open-mb.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ $db = new SQLite3($db_file);
1010
//require_once(__DIR__ . '/new_db.inc');
1111

1212
var_dump($db);
13-
var_dump($db->close());
13+
$db->close();
1414

1515
unlink($db_file);
1616
echo "Done\n";
1717
?>
1818
--EXPECTF--
1919
object(SQLite3)#%d (0) {
2020
}
21-
bool(true)
2221
Done

‎ext/sqlite3/tests/sqlite3_01_open.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ sqlite3
88
require_once(__DIR__ . '/new_db.inc');
99

1010
var_dump($db);
11-
var_dump($db->close());
11+
$db->close();
1212
echo "Done\n";
1313
?>
1414
--EXPECTF--
1515
object(SQLite3)#%d (0) {
1616
}
17-
bool(true)
1817
Done

‎ext/sqlite3/tests/sqlite3_02_create.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ echo "Dropping database\n";
1717
var_dump($db->exec('DROP TABLE test'));
1818

1919
echo "Closing database\n";
20-
var_dump($db->close());
20+
$db->close();
2121
echo "Done\n";
2222
?>
2323
--EXPECTF--
@@ -30,5 +30,4 @@ bool(false)
3030
Dropping database
3131
bool(true)
3232
Closing database
33-
bool(true)
3433
Done

‎ext/sqlite3/tests/sqlite3_03_insert.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
2424
$results->finalize();
2525

2626
echo "Closing database\n";
27-
var_dump($db->close());
27+
$db->close();
2828
echo "Done\n";
2929
?>
3030
--EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
4747
string(1) "b"
4848
}
4949
Closing database
50-
bool(true)
5150
Done

‎ext/sqlite3/tests/sqlite3_04_update.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
3535
$results->finalize();
3636

3737
echo "Closing database\n";
38-
var_dump($db->close());
38+
$db->close();
3939
echo "Done\n";
4040
?>
4141
--EXPECTF--
@@ -73,5 +73,4 @@ array(2) {
7373
string(1) "c"
7474
}
7575
Closing database
76-
bool(true)
7776
Done

‎ext/sqlite3/tests/sqlite3_05_delete.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
3535
$results->finalize();
3636

3737
echo "Closing database\n";
38-
var_dump($db->close());
38+
$db->close();
3939
echo "Done\n";
4040
?>
4141
--EXPECTF--
@@ -67,5 +67,4 @@ array(2) {
6767
string(1) "b"
6868
}
6969
Closing database
70-
bool(true)
7170
Done

‎ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
2929
$results->finalize();
3030

3131
echo "Closing database\n";
32-
var_dump($db->close());
32+
$db->close();
3333
echo "Done\n";
3434
?>
3535
--EXPECTF--
@@ -48,5 +48,4 @@ array(2) {
4848
string(1) "a"
4949
}
5050
Closing database
51-
bool(true)
5251
Done

‎ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
2828
$results->finalize();
2929

3030
echo "Closing database\n";
31-
var_dump($db->close());
31+
$db->close();
3232
echo "Done\n";
3333
?>
3434
--EXPECTF--
@@ -47,5 +47,4 @@ array(2) {
4747
string(1) "a"
4848
}
4949
Closing database
50-
bool(true)
5150
Done

‎ext/sqlite3/tests/sqlite3_08_udf.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
3232
$results->finalize();
3333

3434
echo "Closing database\n";
35-
var_dump($db->close());
35+
$db->close();
3636
echo "Done\n";
3737
?>
3838
--EXPECT--
@@ -53,5 +53,4 @@ array(1) {
5353
string(32) "92eb5ffee6ae2fec3ad71c777531578f"
5454
}
5555
Closing database
56-
bool(true)
5756
Done

‎ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var_dump($insert_stmt->bindValue(1, 'a', SQLITE3_TEXT));
2424
var_dump($insert_stmt->bindParam(2, $foo, SQLITE3_BLOB));
2525
$insert_stmt->execute();
2626
echo "Closing statement\n";
27-
var_dump($insert_stmt->close());
27+
$insert_stmt->close();
2828

2929
echo "SELECTING results\n";
3030
$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))
3535
$results->finalize();
3636

3737
echo "Closing database\n";
38-
var_dump($db->close());
38+
$db->close();
3939
echo "Done\n";
4040
?>
4141
--EXPECTF--
@@ -48,7 +48,6 @@ BINDING Parameter
4848
bool(true)
4949
bool(true)
5050
Closing statement
51-
bool(true)
5251
SELECTING results
5352
array(2) {
5453
[0]=>
@@ -57,5 +56,4 @@ array(2) {
5756
string(23) "X'61626364656667006869'"
5857
}
5958
Closing database
60-
bool(true)
6159
Done

‎ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
3030
$results->finalize();
3131

3232
echo "Closing database\n";
33-
var_dump($db->close());
33+
$db->close();
3434
echo "Done\n";
3535
?>
3636
--EXPECTF--
@@ -51,5 +51,4 @@ array(2) {
5151
string(1) "a"
5252
}
5353
Closing database
54-
bool(true)
5554
Done

‎ext/sqlite3/tests/sqlite3_11_numrows.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var_dump($results->numRows());
3131
$results->finalize();
3232

3333
echo "Closing database\n";
34-
var_dump($db->close());
34+
$db->close();
3535
echo "Done\n";
3636
?>
3737
--EXPECT--
@@ -44,5 +44,4 @@ SELECTING results
4444
Number of rows
4545
int(2)
4646
Closing database
47-
bool(true)
4847
Done

‎ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
2525
}
2626

2727
echo "Closing database\n";
28-
var_dump($db->close());
28+
$db->close();
2929
echo "Check db was closed\n";
3030
try {
3131
var_dump($results->numColumns());
@@ -48,7 +48,6 @@ array(2) {
4848
string(1) "a"
4949
}
5050
Closing database
51-
bool(true)
5251
Check db was closed
5352
The SQLite3Result object has not been correctly initialised or is already closed
5453
Done

‎ext/sqlite3/tests/sqlite3_16_select_no_results.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ while ($result = $results->fetchArray(SQLITE3_NUM))
2020
$results->finalize();
2121

2222
echo "Closing database\n";
23-
var_dump($db->close());
23+
$db->close();
2424
echo "Done\n";
2525
?>
2626
--EXPECT--
2727
Creating Table
2828
bool(true)
2929
SELECTING results
3030
Closing database
31-
bool(true)
3231
Done

‎ext/sqlite3/tests/sqlite3_18_changes.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo "Rows Updated\n";
2222
var_dump($db->changes());
2323

2424
echo "Closing database\n";
25-
var_dump($db->close());
25+
$db->close();
2626
echo "Done\n";
2727
?>
2828
--EXPECT--
@@ -36,5 +36,4 @@ bool(true)
3636
Rows Updated
3737
int(2)
3838
Closing database
39-
bool(true)
4039
Done

‎ext/sqlite3/tests/sqlite3_19_columninfo.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ while ($row = $result->fetchArray(SQLITE3_NUM)) {
2626
$result->finalize();
2727

2828
echo "Closing database\n";
29-
var_dump($db->close());
29+
$db->close();
3030
echo "Done\n";
3131
?>
3232
--EXPECT--
@@ -41,5 +41,4 @@ Name: id - Type: 3
4141
Name: time - Type: 1
4242
Name: id - Type: 3
4343
Closing database
44-
bool(true)
4544
Done

0 commit comments

Comments
 (0)