diff --git a/ext/intl/breakiterator/breakiterator.stub.php b/ext/intl/breakiterator/breakiterator.stub.php
index 35a57e44b9094..2c403117fcbe2 100644
--- a/ext/intl/breakiterator/breakiterator.stub.php
+++ b/ext/intl/breakiterator/breakiterator.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class IntlBreakIterator implements IteratorAggregate
 {
@@ -86,12 +89,6 @@ public function getRuleStatus() {}
     public function getRuleStatusVec() {}
 }
 
-class IntlPartsIterator extends IntlIterator
-{
-    /** @return IntlBreakIterator */
-    public function getBreakIterator() {}
-}
-
 class IntlCodePointBreakIterator extends IntlBreakIterator
 {
     /** @return int */
diff --git a/ext/intl/breakiterator/breakiterator_arginfo.h b/ext/intl/breakiterator/breakiterator_arginfo.h
index ec8c0c3ce702b..314ab0d9142d0 100644
--- a/ext/intl/breakiterator/breakiterator_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6a121ed9817667820f05677a772781d6b788796b */
+ * Stub hash: 4fe6fb9a231d635a193f61897cf4ff6f1541c0db */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_createCharacterInstance, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
@@ -72,8 +72,6 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlRuleBasedBreakIterator_getRuleStatusVec arginfo_class_IntlBreakIterator_createCodePointInstance
 
-#define arginfo_class_IntlPartsIterator_getBreakIterator arginfo_class_IntlBreakIterator_createCodePointInstance
-
 #define arginfo_class_IntlCodePointBreakIterator_getLastCodePoint arginfo_class_IntlBreakIterator_createCodePointInstance
 
 
@@ -104,7 +102,6 @@ ZEND_METHOD(IntlRuleBasedBreakIterator, getBinaryRules);
 ZEND_METHOD(IntlRuleBasedBreakIterator, getRules);
 ZEND_METHOD(IntlRuleBasedBreakIterator, getRuleStatus);
 ZEND_METHOD(IntlRuleBasedBreakIterator, getRuleStatusVec);
-ZEND_METHOD(IntlPartsIterator, getBreakIterator);
 ZEND_METHOD(IntlCodePointBreakIterator, getLastCodePoint);
 
 
@@ -145,13 +142,39 @@ static const zend_function_entry class_IntlRuleBasedBreakIterator_methods[] = {
 };
 
 
-static const zend_function_entry class_IntlPartsIterator_methods[] = {
-	ZEND_ME(IntlPartsIterator, getBreakIterator, arginfo_class_IntlPartsIterator_getBreakIterator, ZEND_ACC_PUBLIC)
-	ZEND_FE_END
-};
-
-
 static const zend_function_entry class_IntlCodePointBreakIterator_methods[] = {
 	ZEND_ME(IntlCodePointBreakIterator, getLastCodePoint, arginfo_class_IntlCodePointBreakIterator_getLastCodePoint, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_IntlBreakIterator(zend_class_entry *class_entry_IteratorAggregate)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlBreakIterator", class_IntlBreakIterator_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	zend_class_implements(class_entry, 1, class_entry_IteratorAggregate);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_IntlRuleBasedBreakIterator(zend_class_entry *class_entry_IntlBreakIterator)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator", class_IntlRuleBasedBreakIterator_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlBreakIterator);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_IntlCodePointBreakIterator(zend_class_entry *class_entry_IntlBreakIterator)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator", class_IntlCodePointBreakIterator_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlBreakIterator);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp
index 3f236db2d470a..aa9dd034932f4 100644
--- a/ext/intl/breakiterator/breakiterator_class.cpp
+++ b/ext/intl/breakiterator/breakiterator_class.cpp
@@ -220,13 +220,11 @@ static zend_object *BreakIterator_object_create(zend_class_entry *ce)
  */
 U_CFUNC void breakiterator_register_BreakIterator_class(void)
 {
-	zend_class_entry ce;
-
 	/* Create and register 'BreakIterator' class. */
-	INIT_CLASS_ENTRY(ce, "IntlBreakIterator", class_IntlBreakIterator_methods);
-	ce.create_object = BreakIterator_object_create;
-	ce.get_iterator = _breakiterator_get_iterator;
-	BreakIterator_ce_ptr = zend_register_internal_class(&ce);
+
+	BreakIterator_ce_ptr = register_class_IntlBreakIterator(zend_ce_aggregate);
+	BreakIterator_ce_ptr->create_object = BreakIterator_object_create;
+	BreakIterator_ce_ptr->get_iterator = _breakiterator_get_iterator;
 
 	memcpy(&BreakIterator_handlers, &std_object_handlers,
 		sizeof BreakIterator_handlers);
@@ -236,8 +234,6 @@ U_CFUNC void breakiterator_register_BreakIterator_class(void)
 	BreakIterator_handlers.get_debug_info = BreakIterator_get_debug_info;
 	BreakIterator_handlers.free_obj = BreakIterator_objects_free;
 
-	zend_class_implements(BreakIterator_ce_ptr, 1, zend_ce_aggregate);
-
 	zend_declare_class_constant_long(BreakIterator_ce_ptr,
 		"DONE", sizeof("DONE") - 1, BreakIterator::DONE );
 
@@ -271,15 +267,9 @@ U_CFUNC void breakiterator_register_BreakIterator_class(void)
 
 
 	/* Create and register 'RuleBasedBreakIterator' class. */
-	INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator",
-			class_IntlRuleBasedBreakIterator_methods);
-	RuleBasedBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
-			BreakIterator_ce_ptr);
+	RuleBasedBreakIterator_ce_ptr = register_class_IntlRuleBasedBreakIterator(BreakIterator_ce_ptr);
 
 	/* Create and register 'CodePointBreakIterator' class. */
-	INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator",
-			class_IntlCodePointBreakIterator_methods);
-	CodePointBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
-			BreakIterator_ce_ptr);
+	CodePointBreakIterator_ce_ptr = register_class_IntlCodePointBreakIterator(BreakIterator_ce_ptr);
 }
 /* }}} */
diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp
index 7c955a5ecb232..4eb0fd8da99e8 100644
--- a/ext/intl/breakiterator/breakiterator_iterators.cpp
+++ b/ext/intl/breakiterator/breakiterator_iterators.cpp
@@ -24,7 +24,7 @@
 extern "C" {
 #define USE_BREAKITERATOR_POINTER
 #include "breakiterator_class.h"
-#include "breakiterator_arginfo.h"
+#include "breakiterator_iterators_arginfo.h"
 #include "../intl_convert.h"
 #include "../locale/locale.h"
 #include <zend_exceptions.h>
@@ -287,12 +287,8 @@ U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)
 
 U_CFUNC void breakiterator_register_IntlPartsIterator_class(void)
 {
-	zend_class_entry ce;
-
 	/* Create and register 'BreakIterator' class. */
-	INIT_CLASS_ENTRY(ce, "IntlPartsIterator", class_IntlPartsIterator_methods);
-	IntlPartsIterator_ce_ptr = zend_register_internal_class_ex(&ce,
-			IntlIterator_ce_ptr);
+	IntlPartsIterator_ce_ptr = register_class_IntlPartsIterator(IntlIterator_ce_ptr);
 	IntlPartsIterator_ce_ptr->create_object = IntlPartsIterator_object_create;
 
 	memcpy(&IntlPartsIterator_handlers, &IntlIterator_handlers,
diff --git a/ext/intl/breakiterator/breakiterator_iterators.stub.php b/ext/intl/breakiterator/breakiterator_iterators.stub.php
new file mode 100644
index 0000000000000..6080cc326d578
--- /dev/null
+++ b/ext/intl/breakiterator/breakiterator_iterators.stub.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
+
+class IntlPartsIterator extends IntlIterator
+{
+    /** @return IntlBreakIterator */
+    public function getBreakIterator() {}
+}
diff --git a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
new file mode 100644
index 0000000000000..37e9a18b8cb0d
--- /dev/null
+++ b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
@@ -0,0 +1,25 @@
+/* This is a generated file, edit the .stub.php file instead.
+ * Stub hash: db9382ccfcb8a4d4ea6d01404ece22088f8d419c */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlPartsIterator_getBreakIterator, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+
+ZEND_METHOD(IntlPartsIterator, getBreakIterator);
+
+
+static const zend_function_entry class_IntlPartsIterator_methods[] = {
+	ZEND_ME(IntlPartsIterator, getBreakIterator, arginfo_class_IntlPartsIterator_getBreakIterator, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+zend_class_entry *register_class_IntlPartsIterator(zend_class_entry *class_entry_IntlIterator)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlPartsIterator", class_IntlPartsIterator_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlIterator);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index 3da6ebb1d00e4..39ff1af404d40 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class IntlCalendar
 {
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 8537836d5bd03..deecaab6f4510 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 18a92d3af801f11e5c3b90e5d272fd98b3515c40 */
+ * Stub hash: 06651a7cc83f307403826af1362feca173e2ba4b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -270,3 +270,24 @@ static const zend_function_entry class_IntlGregorianCalendar_methods[] = {
 	ZEND_ME_MAPPING(isLeapYear, intlgregcal_is_leap_year, arginfo_class_IntlGregorianCalendar_isLeapYear, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_IntlCalendar()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlCalendar", class_IntlCalendar_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_IntlGregorianCalendar(zend_class_entry *class_entry_IntlCalendar)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", class_IntlGregorianCalendar_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_IntlCalendar);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index a46ef62e68756..8c1bdf3185be5 100644
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@ -268,12 +268,9 @@ static zend_object *Calendar_object_create(zend_class_entry *ce)
  */
 void calendar_register_IntlCalendar_class(void)
 {
-	zend_class_entry ce;
-
 	/* Create and register 'IntlCalendar' class. */
-	INIT_CLASS_ENTRY(ce, "IntlCalendar", class_IntlCalendar_methods);
-	ce.create_object = Calendar_object_create;
-	Calendar_ce_ptr = zend_register_internal_class(&ce);
+	Calendar_ce_ptr = register_class_IntlCalendar();
+	Calendar_ce_ptr->create_object = Calendar_object_create;
 
 	memcpy( &Calendar_handlers, &std_object_handlers,
 		sizeof Calendar_handlers);
@@ -331,8 +328,6 @@ void calendar_register_IntlCalendar_class(void)
 	CALENDAR_DECL_LONG_CONST("WALLTIME_NEXT_VALID",			UCAL_WALLTIME_NEXT_VALID);
 
 	/* Create and register 'IntlGregorianCalendar' class. */
-	INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", class_IntlGregorianCalendar_methods);
-	GregorianCalendar_ce_ptr = zend_register_internal_class_ex(&ce,
-		Calendar_ce_ptr);
+	GregorianCalendar_ce_ptr = register_class_IntlGregorianCalendar(Calendar_ce_ptr);
 }
 /* }}} */
diff --git a/ext/intl/collator/collator.stub.php b/ext/intl/collator/collator.stub.php
index f42d1508cb965..7c9f16b7584f3 100644
--- a/ext/intl/collator/collator.stub.php
+++ b/ext/intl/collator/collator.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class Collator
 {
diff --git a/ext/intl/collator/collator_arginfo.h b/ext/intl/collator/collator_arginfo.h
index 1b7dcc408f51a..c0e8b6f73d0ea 100644
--- a/ext/intl/collator/collator_arginfo.h
+++ b/ext/intl/collator/collator_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 869c6e60a8f2b153ef79f28a08e165ff3ec2bc14 */
+ * Stub hash: 3f992cc1efe2d4f193c414ceb2811ee0945a60c5 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -85,3 +85,14 @@ static const zend_function_entry class_Collator_methods[] = {
 	ZEND_ME_MAPPING(getSortKey, collator_get_sort_key, arginfo_class_Collator_getSortKey, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_Collator()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "Collator", class_Collator_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c
index 44452c147fa8b..7be73e8ea2695 100644
--- a/ext/intl/collator/collator_class.c
+++ b/ext/intl/collator/collator_class.c
@@ -63,12 +63,9 @@ zend_object *Collator_object_create(zend_class_entry *ce )
  */
 void collator_register_Collator_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'Collator' class. */
-	INIT_CLASS_ENTRY( ce, "Collator", class_Collator_methods );
-	ce.create_object = Collator_object_create;
-	Collator_ce_ptr = zend_register_internal_class( &ce );
+	Collator_ce_ptr = register_class_Collator();
+	Collator_ce_ptr->create_object = Collator_object_create;
 
 	memcpy(&Collator_handlers, &std_object_handlers,
 		sizeof Collator_handlers);
diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index 90971302ce287..7c4ac65262a10 100644
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -966,10 +966,7 @@ static zend_object *php_converter_clone_object(zend_object *object) {
 
 /* {{{ php_converter_minit */
 int php_converter_minit(INIT_FUNC_ARGS) {
-	zend_class_entry ce;
-
-	INIT_CLASS_ENTRY(ce, "UConverter", class_UConverter_methods);
-	php_converter_ce = zend_register_internal_class(&ce);
+	php_converter_ce = register_class_UConverter();
 	php_converter_ce->create_object = php_converter_create_object;
 	memcpy(&php_converter_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	php_converter_object_handlers.offset = XtOffsetOf(php_converter_object, obj);
diff --git a/ext/intl/converter/converter.stub.php b/ext/intl/converter/converter.stub.php
index 5b82b098f47f7..d3174003ae2d2 100644
--- a/ext/intl/converter/converter.stub.php
+++ b/ext/intl/converter/converter.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class UConverter
 {
diff --git a/ext/intl/converter/converter_arginfo.h b/ext/intl/converter/converter_arginfo.h
index 8b8f8fc1f521e..fe14d0e042288 100644
--- a/ext/intl/converter/converter_arginfo.h
+++ b/ext/intl/converter/converter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e33e2614c969c59b79c6062f7a347a8e8e486d85 */
+ * Stub hash: da9dd2dc8a994a6856e1fce33d973d979b7b67ee */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destination_encoding, IS_STRING, 1, "null")
@@ -113,3 +113,14 @@ static const zend_function_entry class_UConverter_methods[] = {
 	ZEND_ME(UConverter, transcode, arginfo_class_UConverter_transcode, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_UConverter()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "UConverter", class_UConverter_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php
index 22ece903c1e25..a49d39ac84639 100644
--- a/ext/intl/dateformat/dateformat.stub.php
+++ b/ext/intl/dateformat/dateformat.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class IntlDateFormatter
 {
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index ff9fbfa6fd348..f66b4dad12177 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 62742b5f463272f43970e98900a89d513c4fb839 */
+ * Stub hash: 3153bf65bc8776681b763284a7355537c5c9ead4 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
@@ -125,3 +125,14 @@ static const zend_function_entry class_IntlDateFormatter_methods[] = {
 	ZEND_ME_MAPPING(getErrorMessage, datefmt_get_error_message, arginfo_class_IntlDateFormatter_getErrorMessage, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_IntlDateFormatter()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlDateFormatter", class_IntlDateFormatter_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index 7d9dde20b056b..b6e0283677089 100644
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -107,12 +107,9 @@ zend_object *IntlDateFormatter_object_clone(zend_object *object)
  */
 void dateformat_register_IntlDateFormatter_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'IntlDateFormatter' class. */
-	INIT_CLASS_ENTRY( ce, "IntlDateFormatter", class_IntlDateFormatter_methods );
-	ce.create_object = IntlDateFormatter_object_create;
-	IntlDateFormatter_ce_ptr = zend_register_internal_class( &ce );
+	IntlDateFormatter_ce_ptr = register_class_IntlDateFormatter();
+	IntlDateFormatter_ce_ptr->create_object = IntlDateFormatter_object_create;
 
 	memcpy(&IntlDateFormatter_handlers, &std_object_handlers,
 		sizeof IntlDateFormatter_handlers);
diff --git a/ext/intl/formatter/formatter.stub.php b/ext/intl/formatter/formatter.stub.php
index 045b0640ce72f..24421ab32b095 100644
--- a/ext/intl/formatter/formatter.stub.php
+++ b/ext/intl/formatter/formatter.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class NumberFormatter
 {
diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
index 79f977fb811f4..1c698c720ddfe 100644
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0f285bbaa6f4f37060eb8325956f41bd86e9dea3 */
+ * Stub hash: 79cf1dbfd95ccb51bff1fda1ae603c87891e00cd */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -111,3 +111,14 @@ static const zend_function_entry class_NumberFormatter_methods[] = {
 	ZEND_ME_MAPPING(getErrorMessage, numfmt_get_error_message, arginfo_class_NumberFormatter_getErrorMessage, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_NumberFormatter()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "NumberFormatter", class_NumberFormatter_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c
index f7965ec7d11e5..e2ff9989b6e72 100644
--- a/ext/intl/formatter/formatter_class.c
+++ b/ext/intl/formatter/formatter_class.c
@@ -94,12 +94,9 @@ zend_object *NumberFormatter_object_clone(zend_object *object)
  */
 void formatter_register_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'NumberFormatter' class. */
-	INIT_CLASS_ENTRY( ce, "NumberFormatter", class_NumberFormatter_methods );
-	ce.create_object = NumberFormatter_object_create;
-	NumberFormatter_ce_ptr = zend_register_internal_class( &ce );
+	NumberFormatter_ce_ptr = register_class_NumberFormatter();
+	NumberFormatter_ce_ptr->create_object = NumberFormatter_object_create;
 	NumberFormatter_ce_ptr->serialize = zend_class_serialize_deny;
 	NumberFormatter_ce_ptr->unserialize = zend_class_unserialize_deny;
 
diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c
index 6babe701529fe..64cf45ce6171e 100644
--- a/ext/intl/intl_error.c
+++ b/ext/intl/intl_error.c
@@ -203,17 +203,6 @@ void intl_errors_set_code( intl_error* err, UErrorCode err_code )
 }
 /* }}} */
 
-void intl_register_IntlException_class( void )
-{
-	zend_class_entry ce;
-
-	/* Create and register 'IntlException' class. */
-	INIT_CLASS_ENTRY_EX( ce, "IntlException", sizeof( "IntlException" ) - 1, NULL );
-	IntlException_ce_ptr = zend_register_internal_class_ex( &ce,
-		zend_ce_exception );
-	IntlException_ce_ptr->create_object = zend_ce_exception->create_object;
-}
-
 smart_str intl_parse_error_to_string( UParseError* pe )
 {
 	smart_str    ret = {0};
diff --git a/ext/intl/intl_error.h b/ext/intl/intl_error.h
index 927e5cdfd296e..bcf5d2cc4a2ce 100644
--- a/ext/intl/intl_error.h
+++ b/ext/intl/intl_error.h
@@ -47,7 +47,4 @@ void        intl_errors_set( intl_error* err, UErrorCode code, const char* msg,
 // Other error helpers
 smart_str	intl_parse_error_to_string( UParseError* pe );
 
-// exported to be called on extension MINIT
-void		intl_register_IntlException_class( void );
-
 #endif // INTL_ERROR_H
diff --git a/ext/intl/locale/locale.stub.php b/ext/intl/locale/locale.stub.php
index e5703293c025b..239b8f3dafbf9 100644
--- a/ext/intl/locale/locale.stub.php
+++ b/ext/intl/locale/locale.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class Locale
 {
diff --git a/ext/intl/locale/locale_arginfo.h b/ext/intl/locale/locale_arginfo.h
index e952146362353..6915149f2982f 100644
--- a/ext/intl/locale/locale_arginfo.h
+++ b/ext/intl/locale/locale_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4135dc9df49d3fe20275d49bad428a2e3e0a8752 */
+ * Stub hash: 36f885043da929f6d9fd52f804b9f3348d7429d6 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_getDefault, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -98,3 +98,14 @@ static const zend_function_entry class_Locale_methods[] = {
 	ZEND_ME_MAPPING(acceptFromHttp, locale_accept_from_http, arginfo_class_Locale_acceptFromHttp, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_Locale()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "Locale", class_Locale_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/locale/locale_class.c b/ext/intl/locale/locale_class.c
index 0670f556205b5..852988b4a646d 100644
--- a/ext/intl/locale/locale_class.c
+++ b/ext/intl/locale/locale_class.c
@@ -30,19 +30,8 @@ zend_class_entry *Locale_ce_ptr = NULL;
  */
 void locale_register_Locale_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'Locale' class. */
-	INIT_CLASS_ENTRY( ce, "Locale", class_Locale_methods );
-	ce.create_object = NULL;
-	Locale_ce_ptr = zend_register_internal_class( &ce );
-
-	/* Declare 'Locale' class properties. */
-	if( !Locale_ce_ptr )
-	{
-		zend_error( E_ERROR,
-			"Locale: Failed to register Locale class.");
-		return;
-	}
+	Locale_ce_ptr = register_class_Locale();
+	Locale_ce_ptr->create_object = NULL;
 }
 /* }}} */
diff --git a/ext/intl/msgformat/msgformat.stub.php b/ext/intl/msgformat/msgformat.stub.php
index a9a3e3e181bb9..15795a19081f0 100644
--- a/ext/intl/msgformat/msgformat.stub.php
+++ b/ext/intl/msgformat/msgformat.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class MessageFormatter
 {
diff --git a/ext/intl/msgformat/msgformat_arginfo.h b/ext/intl/msgformat/msgformat_arginfo.h
index 3bad9aa498493..ea17201a1d900 100644
--- a/ext/intl/msgformat/msgformat_arginfo.h
+++ b/ext/intl/msgformat/msgformat_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ece8c5157dc3a62ca2951d058b3c5497bb5cb836 */
+ * Stub hash: 66861d14ebbf7fa2d96c68f85fb4c3fe615381e1 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -69,3 +69,14 @@ static const zend_function_entry class_MessageFormatter_methods[] = {
 	ZEND_ME_MAPPING(getErrorMessage, msgfmt_get_error_message, arginfo_class_MessageFormatter_getErrorMessage, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_MessageFormatter()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "MessageFormatter", class_MessageFormatter_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/msgformat/msgformat_class.c b/ext/intl/msgformat/msgformat_class.c
index d8bf9a006c050..d8274a1440fbc 100644
--- a/ext/intl/msgformat/msgformat_class.c
+++ b/ext/intl/msgformat/msgformat_class.c
@@ -93,12 +93,9 @@ zend_object *MessageFormatter_object_clone(zend_object *object)
  */
 void msgformat_register_class( void )
 {
-	zend_class_entry ce;
-
 	/* Create and register 'MessageFormatter' class. */
-	INIT_CLASS_ENTRY( ce, "MessageFormatter", class_MessageFormatter_methods );
-	ce.create_object = MessageFormatter_object_create;
-	MessageFormatter_ce_ptr = zend_register_internal_class( &ce );
+	MessageFormatter_ce_ptr = register_class_MessageFormatter();
+	MessageFormatter_ce_ptr->create_object = MessageFormatter_object_create;
 
 	memcpy(&MessageFormatter_handlers, &std_object_handlers,
 		sizeof MessageFormatter_handlers);
diff --git a/ext/intl/normalizer/normalizer.stub.php b/ext/intl/normalizer/normalizer.stub.php
index 243ace532d1cc..201090741f89c 100644
--- a/ext/intl/normalizer/normalizer.stub.php
+++ b/ext/intl/normalizer/normalizer.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @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 cd5a41de60883..5b1fe995f3a9c 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: 3c79515a889216d1eb6d10d2b9dd4c76ffd3acef */
 
 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 7a46acb0b29f4..29299da206742 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;
 }
 /* }}} */
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 2b91266e7ed65..01361ed262a4e 100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -215,7 +215,8 @@ PHP_MINIT_FUNCTION( intl )
 	spoofchecker_register_constants( INIT_FUNC_ARGS_PASSTHRU );
 
 	/* Register 'IntlException' PHP class */
-	intl_register_IntlException_class(  );
+	IntlException_ce_ptr = register_class_IntlException(zend_ce_exception);
+	IntlException_ce_ptr->create_object = zend_ce_exception->create_object;
 
 	/* Register 'IntlIterator' PHP class */
 	intl_register_IntlIterator_class(  );
@@ -224,7 +225,7 @@ PHP_MINIT_FUNCTION( intl )
 	breakiterator_register_BreakIterator_class(  );
 
 	/* Register 'IntlPartsIterator' class */
-	breakiterator_register_IntlPartsIterator_class(  );
+	breakiterator_register_IntlPartsIterator_class();
 
 	/* Global error handling. */
 	intl_error_init( NULL );
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
index 26b7922c2c702..8f2692e3d2c39 100644
--- a/ext/intl/php_intl.stub.php
+++ b/ext/intl/php_intl.stub.php
@@ -1,6 +1,13 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
+
+class IntlException extends Exception
+{
+}
 
 /* calendar */
 
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index 57299b841fb7a..363c874ac83ae 100644
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c890e3cde79ffeade4623001cc369aa734812959 */
+ * Stub hash: b5e3877d6022e0ba7e8536b0d835dd3d031e43b3 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
@@ -1165,3 +1165,19 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(transliterator_get_error_message, arginfo_transliterator_get_error_message)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_IntlException_methods[] = {
+	ZEND_FE_END
+};
+
+zend_class_entry *register_class_IntlException(zend_class_entry *class_entry_Exception)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlException", class_IntlException_methods);
+	class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/spoofchecker/spoofchecker.stub.php b/ext/intl/spoofchecker/spoofchecker.stub.php
index 4fdd49473c5de..f3bda94751836 100644
--- a/ext/intl/spoofchecker/spoofchecker.stub.php
+++ b/ext/intl/spoofchecker/spoofchecker.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class Spoofchecker
 {
diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h
index 6079794fdfe7e..bb38edd921f9e 100644
--- a/ext/intl/spoofchecker/spoofchecker_arginfo.h
+++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 10c330c8e06dbe21833f9c556b005fde2ea0ab42 */
+ * Stub hash: fa0a42cf3c54d9ccb45771e9fd7f05c1ed3bbcb3 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -51,3 +51,14 @@ static const zend_function_entry class_Spoofchecker_methods[] = {
 #endif
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_Spoofchecker()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "Spoofchecker", class_Spoofchecker_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/spoofchecker/spoofchecker_class.c b/ext/intl/spoofchecker/spoofchecker_class.c
index e1c8dc63a16a8..bbb341cda4e3a 100644
--- a/ext/intl/spoofchecker/spoofchecker_class.c
+++ b/ext/intl/spoofchecker/spoofchecker_class.c
@@ -90,12 +90,9 @@ static zend_object *spoofchecker_clone_obj(zend_object *object) /* {{{ */
  */
 void spoofchecker_register_Spoofchecker_class(void)
 {
-	zend_class_entry ce;
-
 	/* Create and register 'Spoofchecker' class. */
-	INIT_CLASS_ENTRY(ce, "Spoofchecker", class_Spoofchecker_methods);
-	ce.create_object = Spoofchecker_object_create;
-	Spoofchecker_ce_ptr = zend_register_internal_class(&ce);
+	Spoofchecker_ce_ptr = register_class_Spoofchecker();
+	Spoofchecker_ce_ptr->create_object = Spoofchecker_object_create;
 
 	memcpy(&Spoofchecker_handlers, &std_object_handlers,
 		sizeof Spoofchecker_handlers);
diff --git a/ext/intl/timezone/timezone.stub.php b/ext/intl/timezone/timezone.stub.php
index 60ec7524a60a3..56c34b4d3fad4 100644
--- a/ext/intl/timezone/timezone.stub.php
+++ b/ext/intl/timezone/timezone.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class IntlTimeZone
 {
diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h
index f59fd9024b81a..ca1ad7367abca 100644
--- a/ext/intl/timezone/timezone_arginfo.h
+++ b/ext/intl/timezone/timezone_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: afd0e74b29d54cde9789787b924af9b43539a7f4 */
+ * Stub hash: 5fffdb0fe55044c7676ada3706e9f7ae8a66d1da */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -152,3 +152,14 @@ static const zend_function_entry class_IntlTimeZone_methods[] = {
 	ZEND_ME_MAPPING(useDaylightTime, intltz_use_daylight_time, arginfo_class_IntlTimeZone_useDaylightTime, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_IntlTimeZone()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlTimeZone", class_IntlTimeZone_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index f5749fd621de8..13e691ad97100 100644
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -396,18 +396,9 @@ static zend_object *TimeZone_object_create(zend_class_entry *ce)
  */
 U_CFUNC void timezone_register_IntlTimeZone_class(void)
 {
-	zend_class_entry ce;
-
 	/* Create and register 'IntlTimeZone' class. */
-	INIT_CLASS_ENTRY(ce, "IntlTimeZone", class_IntlTimeZone_methods);
-	ce.create_object = TimeZone_object_create;
-	TimeZone_ce_ptr = zend_register_internal_class(&ce);
-	if (!TimeZone_ce_ptr) {
-		//can't happen now without bigger problems before
-		php_error_docref(NULL, E_ERROR,
-			"IntlTimeZone: class registration has failed.");
-		return;
-	}
+	TimeZone_ce_ptr = register_class_IntlTimeZone();
+	TimeZone_ce_ptr->create_object = TimeZone_object_create;
 
 	memcpy(&TimeZone_handlers, &std_object_handlers,
 		sizeof TimeZone_handlers);
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c
index 0f44b454b4499..ee90007546883 100644
--- a/ext/intl/uchar/uchar.c
+++ b/ext/intl/uchar/uchar.c
@@ -612,10 +612,9 @@ IC_CHAR_METHOD_CHAR(getBidiPairedBracket)
 /* }}} */
 
 int php_uchar_minit(INIT_FUNC_ARGS) {
-	zend_class_entry tmp, *ce;
+	zend_class_entry *ce;
 
-	INIT_CLASS_ENTRY(tmp, "IntlChar", class_IntlChar_methods);
-	ce = zend_register_internal_class(&tmp);
+	ce = register_class_IntlChar();
 
 #define IC_CONSTL(name, val) \
 	zend_declare_class_constant_long(ce, name, strlen(name), val);
diff --git a/ext/intl/uchar/uchar.stub.php b/ext/intl/uchar/uchar.stub.php
index f3ebd78bcb75c..b11b6101f99cb 100644
--- a/ext/intl/uchar/uchar.stub.php
+++ b/ext/intl/uchar/uchar.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 class IntlChar
 {
diff --git a/ext/intl/uchar/uchar_arginfo.h b/ext/intl/uchar/uchar_arginfo.h
index c4e22cd767784..bc4e291270934 100644
--- a/ext/intl/uchar/uchar_arginfo.h
+++ b/ext/intl/uchar/uchar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 05ea5d884642e75721f90728fb24b7ad5ce46897 */
+ * Stub hash: 411e6feceed10b97becdcbcc03f0236c7d38c92e */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_hasBinaryProperty, 0, 0, 2)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -295,3 +295,14 @@ static const zend_function_entry class_IntlChar_methods[] = {
 	ZEND_ME(IntlChar, toupper, arginfo_class_IntlChar_toupper, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_IntlChar()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "IntlChar", class_IntlChar_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+