Skip to content

Commit eef994d

Browse files
committed
Improve parameter names in ext/pdo_sqlite
Closes GH-6310
1 parent 6edad17 commit eef994d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

ext/pdo_sqlite/sqlite_driver.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// These are extension methods for PDO. This is not a real class.
66
class PDO_SQLite_Ext {
77
/** @return bool */
8-
public function sqliteCreateFunction(string $function_name, callable $callback, int $num_args = -1, int $flags = 0) {}
8+
public function sqliteCreateFunction(string $name, callable $callback, int $numArgs = -1, int $flags = 0) {}
99

1010
/** @return bool */
11-
public function sqliteCreateAggregate(string $function_name, callable $step_func, callable $finalize_func, int $num_args = -1) {}
11+
public function sqliteCreateAggregate(string $name, callable $step, callable $finalize, int $numArgs = -1) {}
1212

1313
/** @return bool */
1414
public function sqliteCreateCollation(string $name, callable $callback) {}

ext/pdo_sqlite/sqlite_driver_arginfo.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: e367675f85371fb06484e39dd6ccb3433766ffb8 */
2+
* Stub hash: 49737f1a08f0b1b66e326b7d06e316105202d27d */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_SQLite_Ext_sqliteCreateFunction, 0, 0, 2)
5-
ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0)
5+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
66
ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
7-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, num_args, IS_LONG, 0, "-1")
7+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, numArgs, IS_LONG, 0, "-1")
88
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
99
ZEND_END_ARG_INFO()
1010

1111
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_SQLite_Ext_sqliteCreateAggregate, 0, 0, 3)
12-
ZEND_ARG_TYPE_INFO(0, function_name, IS_STRING, 0)
13-
ZEND_ARG_TYPE_INFO(0, step_func, IS_CALLABLE, 0)
14-
ZEND_ARG_TYPE_INFO(0, finalize_func, IS_CALLABLE, 0)
15-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, num_args, IS_LONG, 0, "-1")
12+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
13+
ZEND_ARG_TYPE_INFO(0, step, IS_CALLABLE, 0)
14+
ZEND_ARG_TYPE_INFO(0, finalize, IS_CALLABLE, 0)
15+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, numArgs, IS_LONG, 0, "-1")
1616
ZEND_END_ARG_INFO()
1717

1818
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_SQLite_Ext_sqliteCreateCollation, 0, 0, 2)

ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ try {
2020

2121
?>
2222
--EXPECT--
23-
PDO::sqliteCreateAggregate(): Argument #2 ($step_func) must be a valid callback, function "a" not found or invalid function name
24-
PDO::sqliteCreateAggregate(): Argument #3 ($finalize_func) must be a valid callback, function "" not found or invalid function name
23+
PDO::sqliteCreateAggregate(): Argument #2 ($step) must be a valid callback, function "a" not found or invalid function name
24+
PDO::sqliteCreateAggregate(): Argument #3 ($finalize) must be a valid callback, function "" not found or invalid function name

0 commit comments

Comments
 (0)