Generate function entries from stubs for a couple of extensions

Author: kocsismate

ext/standard/dir.c

@@ -87,13 +87,6 @@ static zend_class_entry *dir_class_entry_ptr;
 		} \
 	}
 
-static const zend_function_entry php_dir_class_functions[] = {
-	PHP_FALIAS(close,	closedir,		arginfo_class_Directory_close)
-	PHP_FALIAS(rewind,	rewinddir,		arginfo_class_Directory_rewind)
-	PHP_FALIAS(read,	readdir,		arginfo_class_Directory_read)
-	PHP_FE_END
-};
-
 
 static void php_set_default_dir(zend_resource *res)
 {
@@ -119,7 +112,7 @@ PHP_MINIT_FUNCTION(dir)
 	static char dirsep_str[2], pathsep_str[2];
 	zend_class_entry dir_class_entry;
 
-	INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions);
+	INIT_CLASS_ENTRY(dir_class_entry, "Directory", class_Directory_methods);
 	dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry);
 
 #ifdef ZTS

ext/standard/dir.stub.php

@@ -1,22 +1,27 @@
 <?php
 
+/** @generate-function-entries */
+
 class Directory
 {
     /**
      * @param resource $dir_handle
      * @return void
+     * @alias closedir
      */
     public function close($dir_handle = UNKNOWN) {}
 
     /**
      * @param resource $dir_handle
      * @return void
+     * @alias rewinddir
      */
     public function rewind($dir_handle = UNKNOWN) {}
 
     /**
      * @param resource $dir_handle
      * @return string|false
+     * @alias readdir
      */
     public function read($dir_handle = UNKNOWN) {}
 }

ext/standard/dir_arginfo.h

@@ -7,3 +7,16 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Directory_rewind arginfo_class_Directory_close
 
 #define arginfo_class_Directory_read arginfo_class_Directory_close
+
+
+ZEND_FUNCTION(closedir);
+ZEND_FUNCTION(rewinddir);
+ZEND_FUNCTION(readdir);
+
+
+static const zend_function_entry class_Directory_methods[] = {
+	ZEND_ME_MAPPING(close, closedir, arginfo_class_Directory_close, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(rewind, rewinddir, arginfo_class_Directory_rewind, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(read, readdir, arginfo_class_Directory_read, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};

ext/standard/user_filters.c

@@ -43,13 +43,6 @@ PHP_FUNCTION(user_filter_nop)
 {
 }
 
-static const zend_function_entry user_filter_class_funcs[] = {
-	PHP_NAMED_FE(filter,	PHP_FN(user_filter_nop),		arginfo_class_php_user_filter_filter)
-	PHP_NAMED_FE(onCreate,	PHP_FN(user_filter_nop),		arginfo_class_php_user_filter_onCreate)
-	PHP_NAMED_FE(onClose,	PHP_FN(user_filter_nop),		arginfo_class_php_user_filter_onClose)
-	PHP_FE_END
-};
-
 static zend_class_entry user_filter_class_entry;
 
 static ZEND_RSRC_DTOR_FUNC(php_bucket_dtor)
@@ -65,7 +58,7 @@ PHP_MINIT_FUNCTION(user_filters)
 {
 	zend_class_entry *php_user_filter;
 	/* init the filter class ancestor */
-	INIT_CLASS_ENTRY(user_filter_class_entry, "php_user_filter", user_filter_class_funcs);
+	INIT_CLASS_ENTRY(user_filter_class_entry, "php_user_filter", class_php_user_filter_methods);
 	if ((php_user_filter = zend_register_internal_class(&user_filter_class_entry)) == NULL) {
 		return FAILURE;
 	}

ext/standard/user_filters.stub.php

@@ -1,13 +1,24 @@
 <?php
 
+/** @generate-function-entries */
+
 class php_user_filter
 {
-    /** @return int */
+    /**
+     * @return int
+     * @alias user_filter_nop
+     */
     public function filter($in, $out, &$consumed, $closing) {}
 
-    /** @return void */
+    /**
+     * @return void
+     * @alias user_filter_nop
+     */
     public function onCreate() {}
 
-    /** @return void */
+    /**
+     * @return void
+     * @alias user_filter_nop
+     */
     public function onClose() {}
 }

ext/standard/user_filters_arginfo.h

@@ -11,3 +11,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_onCreate, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_php_user_filter_onClose arginfo_class_php_user_filter_onCreate
+
+
+ZEND_FUNCTION(user_filter_nop);
+
+
+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_FE_END
+};

ext/tidy/php_tidy.h

@@ -23,16 +23,6 @@ extern zend_module_entry tidy_module_entry;
 #include "php_version.h"
 #define PHP_TIDY_VERSION PHP_VERSION
 
-#define TIDY_METHOD_MAP(name, func_name, arg_types) \
-	ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types)
-#define TIDY_NODE_METHOD(name)    PHP_FUNCTION(tnm_ ##name)
-#define TIDY_NODE_ME(name, param) TIDY_METHOD_MAP(name, tnm_ ##name, param)
-#define TIDY_NODE_PRIVATE_ME(name, param) ZEND_NAMED_ME(name, ZEND_FN(tnm_ ##name), param, ZEND_ACC_PRIVATE)
-#define TIDY_DOC_METHOD(name)     PHP_FUNCTION(tdm_ ##name)
-#define TIDY_DOC_ME(name, param)  TIDY_METHOD_MAP(name, tdm_ ##name, param)
-#define TIDY_ATTR_METHOD(name)    PHP_FUNCTION(tam_ ##name)
-#define TIDY_ATTR_ME(name, param) TIDY_METHOD_MAP(name, tam_ ##name, param)
-
 ZEND_BEGIN_MODULE_GLOBALS(tidy)
 	char *default_config;
 	zend_bool clean_output;