Skip to content

Commit 9002e95

Browse files
committed
Use proper methods for php_user_filter implementation
These are dummy methods, but should at least check zpp for arginfo consistency.
1 parent 952222d commit 9002e95

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

ext/standard/user_filters.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,22 @@ static int le_bucket;
3939

4040
/* define the base filter class */
4141

42-
PHP_FUNCTION(user_filter_nop)
42+
PHP_METHOD(php_user_filter, filter)
4343
{
44+
zval *in, *out, *consumed, *closing;
45+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzzz", &in, &out, &consumed, &closing) == FAILURE) {
46+
RETURN_THROWS();
47+
}
48+
}
49+
50+
PHP_METHOD(php_user_filter, onCreate)
51+
{
52+
ZEND_PARSE_PARAMETERS_NONE();
53+
}
54+
55+
PHP_METHOD(php_user_filter, onClose)
56+
{
57+
ZEND_PARSE_PARAMETERS_NONE();
4458
}
4559

4660
static zend_class_entry user_filter_class_entry;

ext/standard/user_filters.stub.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,12 @@
44

55
class php_user_filter
66
{
7-
/**
8-
* @return int
9-
* @alias user_filter_nop
10-
*/
7+
/** @return int */
118
public function filter($in, $out, &$consumed, $closing) {}
129

13-
/**
14-
* @return void
15-
* @alias user_filter_nop
16-
*/
10+
/** @return void */
1711
public function onCreate() {}
1812

19-
/**
20-
* @return void
21-
* @alias user_filter_nop
22-
*/
13+
/** @return void */
2314
public function onClose() {}
2415
}

ext/standard/user_filters_arginfo.h

Lines changed: 7 additions & 5 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: 61e071b8e6d9a2ed02a9667cfa16a97fcd9d7bd4 */
2+
* Stub hash: 1c95e4944aab77be8b65da8a6877738b1f061b69 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_filter, 0, 0, 4)
55
ZEND_ARG_INFO(0, in)
@@ -14,12 +14,14 @@ ZEND_END_ARG_INFO()
1414
#define arginfo_class_php_user_filter_onClose arginfo_class_php_user_filter_onCreate
1515

1616

17-
ZEND_FUNCTION(user_filter_nop);
17+
ZEND_METHOD(php_user_filter, filter);
18+
ZEND_METHOD(php_user_filter, onCreate);
19+
ZEND_METHOD(php_user_filter, onClose);
1820

1921

2022
static const zend_function_entry class_php_user_filter_methods[] = {
21-
ZEND_ME_MAPPING(filter, user_filter_nop, arginfo_class_php_user_filter_filter, ZEND_ACC_PUBLIC)
22-
ZEND_ME_MAPPING(onCreate, user_filter_nop, arginfo_class_php_user_filter_onCreate, ZEND_ACC_PUBLIC)
23-
ZEND_ME_MAPPING(onClose, user_filter_nop, arginfo_class_php_user_filter_onClose, ZEND_ACC_PUBLIC)
23+
ZEND_ME(php_user_filter, filter, arginfo_class_php_user_filter_filter, ZEND_ACC_PUBLIC)
24+
ZEND_ME(php_user_filter, onCreate, arginfo_class_php_user_filter_onCreate, ZEND_ACC_PUBLIC)
25+
ZEND_ME(php_user_filter, onClose, arginfo_class_php_user_filter_onClose, ZEND_ACC_PUBLIC)
2426
ZEND_FE_END
2527
};

0 commit comments

Comments
 (0)