Skip to content

Commit ede71c5

Browse files
kamil-tekielakamil-tekiela
committed
Improve parameter names in ext/sqlite3
Update sqlite3_arginfo.h s/enableExceptions/enable BindValue uses $value $name is more appropriate
1 parent 47ef51c commit ede71c5

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎ext/sqlite3/sqlite3.stub.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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 $sqlite3, string $source_database = "main", string $destination_database = "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) {}
@@ -69,10 +69,10 @@ public function createAggregate(string $name, callable $step_callback, callable
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) {}
@@ -86,10 +86,10 @@ class SQLite3Stmt
8686
private function __construct(SQLite3 $sqlite3, string $sql) {}
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 &$bind_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 $index) {}
125125

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

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

‎ext/sqlite3/sqlite3_arginfo.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 293f1041949989de457a4091b751674bf301c2bd */
2+
* Stub hash: 343a1ef283e97363ab012922c7af1913728d1ca6 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -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, sqlite3, SQLite3, 0)
40+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, source_database, IS_STRING, 0, "\"main\"")
41+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destination_database, 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)
@@ -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)
@@ -104,14 +104,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SQLite3Stmt___construct, 0, 0, 2)
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, bind_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, index, IS_LONG, 0)
140140
ZEND_END_ARG_INFO()
141141

142142
#define arginfo_class_SQLite3Result_columnType arginfo_class_SQLite3Result_columnName

0 commit comments

Comments
 (0)