Generate ext/intl class entries from stubs

Closes GH-6670

3 files changed, 15 insertions, 16 deletions

diff --git a/ext/intl/normalizer/normalizer.stub.php b/ext/intl/normalizer/normalizer.stub.php
index 243ace532d..0c9e1785dc 100644
--- a/ext/intl/normalizer/normalizer.stub.php
+++ b/ext/intl/normalizer/normalizer.stub.php
@@ -1,6 +1,6 @@
 <?php
 
-/** @generate-function-entries */
+/** @generate-class-entries */
 
 class Normalizer
 {
diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h
index cd5a41de60..efd94ead6b 100644
--- a/ext/intl/normalizer/normalizer_arginfo.h
+++ b/ext/intl/normalizer/normalizer_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3b9ef4888cc32bd009fb87db52859953902454fc */
+ * Stub hash: 651065249a99f9ee50126d58223b8f4527e3fc09 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_normalize, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -31,3 +31,14 @@ static const zend_function_entry class_Normalizer_methods[] = {
 #endif
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_Normalizer()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "Normalizer", class_Normalizer_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/normalizer/normalizer_class.c b/ext/intl/normalizer/normalizer_class.c
index 7a46acb0b2..29299da206 100644
--- a/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c
@@ -30,20 +30,8 @@ zend_class_entry *Normalizer_ce_ptr = NULL;
  */
 void normalizer_register_Normalizer_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'Normalizer' class. */
-	INIT_CLASS_ENTRY( ce, "Normalizer", class_Normalizer_methods );
-	ce.create_object = NULL;
-	Normalizer_ce_ptr = zend_register_internal_class( &ce );
-
-	/* Declare 'Normalizer' class properties. */
-	if( !Normalizer_ce_ptr )
-	{
-		zend_error( E_ERROR,
-			"Normalizer: attempt to create properties "
-			"on a non-registered class." );
-		return;
-	}
+	Normalizer_ce_ptr = register_class_Normalizer();
+	Normalizer_ce_ptr->create_object = NULL;
 }
 /* }}} */