From 9002e95f7c0aa73d621bf54b2ad19aeef037e95c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 17 Jul 2020 16:54:15 +0200
Subject: [PATCH] Use proper methods for php_user_filter implementation

These are dummy methods, but should at least check zpp for
arginfo consistency.
---
 ext/standard/user_filters.c         | 16 +++++++++++++++-
 ext/standard/user_filters.stub.php  | 15 +++------------
 ext/standard/user_filters_arginfo.h | 12 +++++++-----
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 93d4144721..464f792f2e 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -39,8 +39,22 @@ static int le_bucket;
 
 /* define the base filter class */
 
-PHP_FUNCTION(user_filter_nop)
+PHP_METHOD(php_user_filter, filter)
 {
+	zval *in, *out, *consumed, *closing;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzzz", &in, &out, &consumed, &closing) == FAILURE) {
+		RETURN_THROWS();
+	}
+}
+
+PHP_METHOD(php_user_filter, onCreate)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+}
+
+PHP_METHOD(php_user_filter, onClose)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
 }
 
 static zend_class_entry user_filter_class_entry;
diff --git a/ext/standard/user_filters.stub.php b/ext/standard/user_filters.stub.php
index 8c1b7e5fe6..38c66c6bc1 100755
--- a/ext/standard/user_filters.stub.php
+++ b/ext/standard/user_filters.stub.php
@@ -4,21 +4,12 @@
 
 class php_user_filter
 {
-    /**
-     * @return int
-     * @alias user_filter_nop
-     */
+    /** @return int */
     public function filter($in, $out, &$consumed, $closing) {}
 
-    /**
-     * @return void
-     * @alias user_filter_nop
-     */
+    /** @return void */
     public function onCreate() {}
 
-    /**
-     * @return void
-     * @alias user_filter_nop
-     */
+    /** @return void */
     public function onClose() {}
 }
diff --git a/ext/standard/user_filters_arginfo.h b/ext/standard/user_filters_arginfo.h
index 08e5e40748..bf4a918923 100644
--- a/ext/standard/user_filters_arginfo.h
+++ b/ext/standard/user_filters_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 61e071b8e6d9a2ed02a9667cfa16a97fcd9d7bd4 */
+ * Stub hash: 1c95e4944aab77be8b65da8a6877738b1f061b69 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_filter, 0, 0, 4)
 	ZEND_ARG_INFO(0, in)
@@ -14,12 +14,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_php_user_filter_onClose arginfo_class_php_user_filter_onCreate
 
 
-ZEND_FUNCTION(user_filter_nop);
+ZEND_METHOD(php_user_filter, filter);
+ZEND_METHOD(php_user_filter, onCreate);
+ZEND_METHOD(php_user_filter, onClose);
 
 
 static const zend_function_entry class_php_user_filter_methods[] = {
-	ZEND_ME_MAPPING(filter, user_filter_nop, arginfo_class_php_user_filter_filter, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(onCreate, user_filter_nop, arginfo_class_php_user_filter_onCreate, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(onClose, user_filter_nop, arginfo_class_php_user_filter_onClose, ZEND_ACC_PUBLIC)
+	ZEND_ME(php_user_filter, filter, arginfo_class_php_user_filter_filter, ZEND_ACC_PUBLIC)
+	ZEND_ME(php_user_filter, onCreate, arginfo_class_php_user_filter_onCreate, ZEND_ACC_PUBLIC)
+	ZEND_ME(php_user_filter, onClose, arginfo_class_php_user_filter_onClose, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
-- 
2.40.0