Skip to content

Commit 1c411ed

Browse files
kamil-tekielakocsismate
kamil-tekiela
authored and
kocsismate
committed
Improve parameter names in ext/sqlite3
Closes GH-6264
1 parent ec484a0 commit 1c411ed

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎ext/sqlite3/sqlite3.stub.php

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
class SQLite3
66
{
77
/** @implementation-alias SQLite3::open */
8-
public function __construct(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryption_key = "") {}
8+
public function __construct(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryptionKey = "") {}
99

1010
/** @return void */
11-
public function open(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryption_key = "") {}
11+
public function open(string $filename, int $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, string $encryptionKey = "") {}
1212

1313
/** @return bool */
1414
public function close() {}
@@ -32,20 +32,20 @@ public function lastErrorMsg() {}
3232
public function changes() {}
3333

3434
/** @return bool */
35-
public function busyTimeout(int $ms) {}
35+
public function busyTimeout(int $milliseconds) {}
3636

3737
#ifndef SQLITE_OMIT_LOAD_EXTENSION
3838
/** @return bool */
39-
public function loadExtension(string $shared_library) {}
39+
public function loadExtension(string $name) {}
4040
#endif
4141

4242
#if SQLITE_VERSION_NUMBER >= 3006011
4343
/** @return bool */
44-
public function backup(SQLite3 $destination_db, string $source_dbname = "main", string $destination_dbname = "main") {}
44+
public function backup(SQLite3 $destination, string $sourceDatabase = "main", string $destinationDatabase = "main") {}
4545
#endif
4646

4747
/** @return string */
48-
public static function escapeString(string $value) {}
48+
public static function escapeString(string $string) {}
4949

5050
/** @return SQLite3Stmt|false */
5151
public function prepare(string $query) {}
@@ -57,22 +57,22 @@ public function exec(string $query) {}
5757
public function query(string $query) {}
5858

5959
/** @return mixed */
60-
public function querySingle(string $query, bool $entire_row = false) {}
60+
public function querySingle(string $query, bool $entireRow = false) {}
6161

6262
/** @return bool */
63-
public function createFunction(string $name, callable $callback, int $argument_count = -1, int $flags = 0) {}
63+
public function createFunction(string $name, callable $callback, int $argCount = -1, int $flags = 0) {}
6464

6565
/** @return bool */
66-
public function createAggregate(string $name, callable $step_callback, callable $final_callback, int $argument_count = -1) {}
66+
public function createAggregate(string $name, callable $stepCallback, callable $finalCallback, int $argCount = -1) {}
6767

6868
/** @return bool */
6969
public function createCollation(string $name, callable $callback) {}
7070

7171
/** @return resource|false */
72-
public function openBlob(string $table, string $column, int $rowid, string $dbname = "main", int $flags = SQLITE3_OPEN_READONLY) {}
72+
public function openBlob(string $table, string $column, int $rowid, string $database = "main", int $flags = SQLITE3_OPEN_READONLY) {}
7373

7474
/** @return bool */
75-
public function enableExceptions(bool $enableExceptions = false) {}
75+
public function enableExceptions(bool $enable = false) {}
7676

7777
/** @return bool */
7878
public function enableExtendedResultCodes(bool $enable = true) {}
@@ -83,13 +83,13 @@ public function setAuthorizer(?callable $callback) {}
8383

8484
class SQLite3Stmt
8585
{
86-
private function __construct(SQLite3 $sqlite3, string $sql) {}
86+
private function __construct(SQLite3 $sqlite3, string $query) {}
8787

8888
/** @return bool */
89-
public function bindParam(string|int $param_number, mixed &$param, int $type = SQLITE3_TEXT) {}
89+
public function bindParam(string|int $param, mixed &$var, int $type = SQLITE3_TEXT) {}
9090

9191
/** @return bool */
92-
public function bindValue(string|int $param_number, mixed $param, int $type = SQLITE3_TEXT) {}
92+
public function bindValue(string|int $param, mixed $value, int $type = SQLITE3_TEXT) {}
9393

9494
/** @return bool */
9595
public function clear() {}
@@ -101,7 +101,7 @@ public function close() {}
101101
public function execute() {}
102102

103103
/** @return string|false */
104-
public function getSQL(bool $expanded = false) {}
104+
public function getSQL(bool $expand = false) {}
105105

106106
/** @return int */
107107
public function paramCount() {}
@@ -121,10 +121,10 @@ private function __construct() {}
121121
public function numColumns() {}
122122

123123
/** @return string|false */
124-
public function columnName(int $column_number) {}
124+
public function columnName(int $column) {}
125125

126126
/** @return int|false */
127-
public function columnType(int $column_number) {}
127+
public function columnType(int $column) {}
128128

129129
/** @return array|false */
130130
public function fetchArray(int $mode = SQLITE3_BOTH) {}

‎ext/sqlite3/sqlite3_arginfo.h

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 293f1041949989de457a4091b751674bf301c2bd */
2+
* Stub hash: 20d9cd75afa2a9b9d4eb6c8019e7c47d34778df4 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
66
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE")
7-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encryption_key, IS_STRING, 0, "\"\"")
7+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encryptionKey, IS_STRING, 0, "\"\"")
88
ZEND_END_ARG_INFO()
99

1010
#define arginfo_class_SQLite3_open arginfo_class_SQLite3___construct
@@ -25,25 +25,25 @@ ZEND_END_ARG_INFO()
2525
#define arginfo_class_SQLite3_changes arginfo_class_SQLite3_close
2626

2727
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_busyTimeout, 0, 0, 1)
28-
ZEND_ARG_TYPE_INFO(0, ms, IS_LONG, 0)
28+
ZEND_ARG_TYPE_INFO(0, milliseconds, IS_LONG, 0)
2929
ZEND_END_ARG_INFO()
3030

3131
#if !defined(SQLITE_OMIT_LOAD_EXTENSION)
3232
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_loadExtension, 0, 0, 1)
33-
ZEND_ARG_TYPE_INFO(0, shared_library, IS_STRING, 0)
33+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
3434
ZEND_END_ARG_INFO()
3535
#endif
3636

3737
#if SQLITE_VERSION_NUMBER >= 3006011
3838
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_backup, 0, 0, 1)
39-
ZEND_ARG_OBJ_INFO(0, destination_db, SQLite3, 0)
40-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, source_dbname, IS_STRING, 0, "\"main\"")
41-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destination_dbname, IS_STRING, 0, "\"main\"")
39+
ZEND_ARG_OBJ_INFO(0, destination, SQLite3, 0)
40+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sourceDatabase, IS_STRING, 0, "\"main\"")
41+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destinationDatabase, IS_STRING, 0, "\"main\"")
4242
ZEND_END_ARG_INFO()
4343
#endif
4444

4545
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_escapeString, 0, 0, 1)
46-
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
46+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
4747
ZEND_END_ARG_INFO()
4848

4949
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_prepare, 0, 0, 1)
@@ -56,21 +56,21 @@ ZEND_END_ARG_INFO()
5656

5757
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_querySingle, 0, 0, 1)
5858
ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
59-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, entire_row, _IS_BOOL, 0, "false")
59+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, entireRow, _IS_BOOL, 0, "false")
6060
ZEND_END_ARG_INFO()
6161

6262
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_createFunction, 0, 0, 2)
6363
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
6464
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
65-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, argument_count, IS_LONG, 0, "-1")
65+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, argCount, IS_LONG, 0, "-1")
6666
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
6767
ZEND_END_ARG_INFO()
6868

6969
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_createAggregate, 0, 0, 3)
7070
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
71-
ZEND_ARG_TYPE_INFO(0, step_callback, IS_CALLABLE, 0)
72-
ZEND_ARG_TYPE_INFO(0, final_callback, IS_CALLABLE, 0)
73-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, argument_count, IS_LONG, 0, "-1")
71+
ZEND_ARG_TYPE_INFO(0, stepCallback, IS_CALLABLE, 0)
72+
ZEND_ARG_TYPE_INFO(0, finalCallback, IS_CALLABLE, 0)
73+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, argCount, IS_LONG, 0, "-1")
7474
ZEND_END_ARG_INFO()
7575

7676
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_createCollation, 0, 0, 2)
@@ -82,12 +82,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_openBlob, 0, 0, 3)
8282
ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
8383
ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)
8484
ZEND_ARG_TYPE_INFO(0, rowid, IS_LONG, 0)
85-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dbname, IS_STRING, 0, "\"main\"")
85+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, database, IS_STRING, 0, "\"main\"")
8686
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SQLITE3_OPEN_READONLY")
8787
ZEND_END_ARG_INFO()
8888

8989
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_enableExceptions, 0, 0, 0)
90-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enableExceptions, _IS_BOOL, 0, "false")
90+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "false")
9191
ZEND_END_ARG_INFO()
9292

9393
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3_enableExtendedResultCodes, 0, 0, 0)
@@ -100,18 +100,18 @@ ZEND_END_ARG_INFO()
100100

101101
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Stmt___construct, 0, 0, 2)
102102
ZEND_ARG_OBJ_INFO(0, sqlite3, SQLite3, 0)
103-
ZEND_ARG_TYPE_INFO(0, sql, IS_STRING, 0)
103+
ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
104104
ZEND_END_ARG_INFO()
105105

106106
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Stmt_bindParam, 0, 0, 2)
107-
ZEND_ARG_TYPE_MASK(0, param_number, MAY_BE_STRING|MAY_BE_LONG, NULL)
108-
ZEND_ARG_TYPE_INFO(1, param, IS_MIXED, 0)
107+
ZEND_ARG_TYPE_MASK(0, param, MAY_BE_STRING|MAY_BE_LONG, NULL)
108+
ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
109109
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "SQLITE3_TEXT")
110110
ZEND_END_ARG_INFO()
111111

112112
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Stmt_bindValue, 0, 0, 2)
113-
ZEND_ARG_TYPE_MASK(0, param_number, MAY_BE_STRING|MAY_BE_LONG, NULL)
114-
ZEND_ARG_TYPE_INFO(0, param, IS_MIXED, 0)
113+
ZEND_ARG_TYPE_MASK(0, param, MAY_BE_STRING|MAY_BE_LONG, NULL)
114+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
115115
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "SQLITE3_TEXT")
116116
ZEND_END_ARG_INFO()
117117

@@ -122,7 +122,7 @@ ZEND_END_ARG_INFO()
122122
#define arginfo_class_SQLite3Stmt_execute arginfo_class_SQLite3_close
123123

124124
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Stmt_getSQL, 0, 0, 0)
125-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, expanded, _IS_BOOL, 0, "false")
125+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, expand, _IS_BOOL, 0, "false")
126126
ZEND_END_ARG_INFO()
127127

128128
#define arginfo_class_SQLite3Stmt_paramCount arginfo_class_SQLite3_close
@@ -136,7 +136,7 @@ ZEND_END_ARG_INFO()
136136
#define arginfo_class_SQLite3Result_numColumns arginfo_class_SQLite3_close
137137

138138
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Result_columnName, 0, 0, 1)
139-
ZEND_ARG_TYPE_INFO(0, column_number, IS_LONG, 0)
139+
ZEND_ARG_TYPE_INFO(0, column, IS_LONG, 0)
140140
ZEND_END_ARG_INFO()
141141

142142
#define arginfo_class_SQLite3Result_columnType arginfo_class_SQLite3Result_columnName

‎ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $db->close();
3232
echo "Done"
3333
?>
3434
--EXPECT--
35-
SQLite3::createAggregate(): Argument #2 ($step_callback) must be a valid callback, function "aggregate_test_step" not found or invalid function name
36-
SQLite3::createAggregate(): Argument #3 ($final_callback) must be a valid callback, function "aggregate_test_final" not found or invalid function name
35+
SQLite3::createAggregate(): Argument #2 ($stepCallback) must be a valid callback, function "aggregate_test_step" not found or invalid function name
36+
SQLite3::createAggregate(): Argument #3 ($finalCallback) must be a valid callback, function "aggregate_test_final" not found or invalid function name
3737
bool(true)
3838
Done

0 commit comments

Comments
 (0)