Generate method entries for ext/intl

Closes GH-5370

5 files changed, 32 insertions, 46 deletions

diff --git a/ext/intl/normalizer/normalizer.stub.php b/ext/intl/normalizer/normalizer.stub.php
index cfa1925262..797eb236b7 100644
--- a/ext/intl/normalizer/normalizer.stub.php
+++ b/ext/intl/normalizer/normalizer.stub.php
@@ -1,15 +1,26 @@
 <?php
 
+/** @generate-function-entries */
+
 class Normalizer
 {
-    /** @return string|false */
+    /**
+     * @return string|false
+     * @alias normalizer_normalize
+     */
     public static function normalize(string $input, int $form = Normalizer::FORM_C) {}
 
-    /** @return bool */
+    /**
+     * @return bool
+     * @alias normalizer_is_normalized
+     */
     public static function isNormalized(string $input, int $form = Normalizer::FORM_C) {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
-    /** @return string|null */
+    /**
+     * @return string|null
+     * @alias normalizer_get_raw_decomposition
+     */
     public static function getRawDecomposition(string $input, int $form = Normalizer::FORM_C) {}
 #endif
 }
diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h
index d4cb5d80fe..aee7284c8b 100644
--- a/ext/intl/normalizer/normalizer_arginfo.h
+++ b/ext/intl/normalizer/normalizer_arginfo.h
@@ -13,3 +13,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_getRawDecomposition, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 #endif
+
+
+ZEND_FUNCTION(normalizer_normalize);
+ZEND_FUNCTION(normalizer_is_normalized);
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+ZEND_FUNCTION(normalizer_get_raw_decomposition);
+#endif
+
+
+static const zend_function_entry class_Normalizer_methods[] = {
+	ZEND_ME_MAPPING(normalize, normalizer_normalize, arginfo_class_Normalizer_normalize, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME_MAPPING(isNormalized, normalizer_is_normalized, arginfo_class_Normalizer_isNormalized, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+	ZEND_ME_MAPPING(getRawDecomposition, normalizer_get_raw_decomposition, arginfo_class_Normalizer_getRawDecomposition, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
+	ZEND_FE_END
+};
diff --git a/ext/intl/normalizer/normalizer_class.c b/ext/intl/normalizer/normalizer_class.c
index 0b6033893c..7a46acb0b2 100644
--- a/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c
@@ -14,7 +14,6 @@
 
 #include "normalizer_class.h"
 #include "php_intl.h"
-#include "normalizer_normalize.h"
 #include "normalizer_arginfo.h"
 #include "intl_error.h"
 
@@ -26,20 +25,6 @@ zend_class_entry *Normalizer_ce_ptr = NULL;
  * 'Normalizer' class registration structures & functions
  */
 
-/* {{{ Normalizer_class_functions
- * Every 'Normalizer' class method has an entry in this table
- */
-
-static const zend_function_entry Normalizer_class_functions[] = {
-	ZEND_FENTRY( normalize, ZEND_FN( normalizer_normalize ), arginfo_class_Normalizer_normalize, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
-	ZEND_FENTRY( isNormalized, ZEND_FN( normalizer_is_normalized ), arginfo_class_Normalizer_isNormalized, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
-#if U_ICU_VERSION_MAJOR_NUM >= 56
-	ZEND_FENTRY( getRawDecomposition, ZEND_FN( normalizer_get_raw_decomposition ), arginfo_class_Normalizer_getRawDecomposition, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
-#endif
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ normalizer_register_Normalizer_class
  * Initialize 'Normalizer' class
  */
@@ -48,7 +33,7 @@ void normalizer_register_Normalizer_class( void )
 	zend_class_entry ce;
 
 	/* Create and register 'Normalizer' class. */
-	INIT_CLASS_ENTRY( ce, "Normalizer", Normalizer_class_functions );
+	INIT_CLASS_ENTRY( ce, "Normalizer", class_Normalizer_methods );
 	ce.create_object = NULL;
 	Normalizer_ce_ptr = zend_register_internal_class( &ce );
 
diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index 5a768730f6..0672631bcd 100644
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -24,7 +24,6 @@
 #endif
 #include "normalizer.h"
 #include "normalizer_class.h"
-#include "normalizer_normalize.h"
 #include "intl_convert.h"
 #include <unicode/utf8.h>
 
diff --git a/ext/intl/normalizer/normalizer_normalize.h b/ext/intl/normalizer/normalizer_normalize.h
deleted file mode 100644
index 9c15f348ce..0000000000
--- a/ext/intl/normalizer/normalizer_normalize.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Ed Batutis <ed@batutis.com>                                 |
-   +----------------------------------------------------------------------+
- */
-
-#ifndef NORMALIZER_NORMALIZE_H
-#define NORMALIZER_NORMALIZE_H
-
-#include <php.h>
-
-PHP_FUNCTION( normalizer_normalize );
-PHP_FUNCTION( normalizer_is_normalized );
-#if U_ICU_VERSION_MAJOR_NUM >= 56
-PHP_FUNCTION( normalizer_get_raw_decomposition );
-#endif
-
-#endif // NORMALIZER_NORMALIZE_H