Generate class entries for a few extensions

kocsismate · kocsismate · commit 5f21062054b1 · 2021-02-03T09:24:09.000+01:00
Relates to GH-6644
diff --git a/ext/bcmath/bcmath.stub.php b/ext/bcmath/bcmath.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 function bcadd(string $num1, string $num2, ?int $scale = null): string {}
 
diff --git a/ext/bcmath/bcmath_arginfo.h b/ext/bcmath/bcmath_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0c1e2a6163a5fc0f42bf79bbc530af7c5fd77074 */
+ * Stub hash: 2232d60eb40f382b141ec28fe9542bd88e784333 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcadd, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
@@ -69,3 +69,4 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(bcscale, arginfo_bcscale)
 	ZEND_FE_END
 };
+
diff --git a/ext/bz2/bz2.stub.php b/ext/bz2/bz2.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 /**
  * @param string|resource $file
diff --git a/ext/bz2/bz2_arginfo.h b/ext/bz2/bz2_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5436fd5a4b0fbfd3b3b3f1caa6a0cf8326c9c5f7 */
+ * Stub hash: 10682cdfc126686cab8497868287459dc574b93d */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzopen, 0, 0, 2)
 	ZEND_ARG_INFO(0, file)
@@ -72,3 +72,4 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(bzdecompress, arginfo_bzdecompress)
 	ZEND_FE_END
 };
+
diff --git a/ext/calendar/calendar.stub.php b/ext/calendar/calendar.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 function cal_days_in_month(int $calendar, int $month, int $year): int {}
 
diff --git a/ext/calendar/calendar_arginfo.h b/ext/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ced2659f54bb25693831315625fe90b33e2f7cbe */
+ * Stub hash: 4953fb1f36502b399061f5e0ca2f700d09761be3 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_days_in_month, 0, 3, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, calendar, IS_LONG, 0)
@@ -116,3 +116,4 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(unixtojd, arginfo_unixtojd)
 	ZEND_FE_END
 };
+
diff --git a/ext/ctype/ctype.stub.php b/ext/ctype/ctype.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 function ctype_alnum(mixed $text): bool {}
 
diff --git a/ext/ctype/ctype_arginfo.h b/ext/ctype/ctype_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: aa287af25fe33a05d15d85b92b0edcfae00284a2 */
+ * Stub hash: bdf377cc2819bdc625cd2ee1afed2f3e7990eef8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ctype_alnum, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, text, IS_MIXED, 0)
@@ -53,3 +53,4 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(ctype_xdigit, arginfo_ctype_xdigit)
 	ZEND_FE_END
 };
+
diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php
@@ -1,15 +1,21 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
+/** @strict-properties */
 final class CurlHandle
 {
 }
 
+/** @strict-properties */
 final class CurlMultiHandle
 {
 }
 
+/** @strict-properties */
 final class CurlShareHandle
 {
 }
diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f1d616c644ad366405816cde0384f6f391773ebf */
+ * Stub hash: 0d1b398a10959922a9e12df75fd8465291058fd5 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -241,3 +241,37 @@ static const zend_function_entry class_CurlMultiHandle_methods[] = {
 static const zend_function_entry class_CurlShareHandle_methods[] = {
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_CurlHandle()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "CurlHandle", class_CurlHandle_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_CurlMultiHandle()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "CurlMultiHandle", class_CurlMultiHandle_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_CurlShareHandle()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "CurlShareHandle", class_CurlShareHandle_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+
+	return class_entry;
+}
+
diff --git a/ext/curl/curl_private.h b/ext/curl/curl_private.h
@@ -152,8 +152,8 @@ static inline php_curlsh *curl_share_from_obj(zend_object *obj) {
 
 #define Z_CURL_SHARE_P(zv) curl_share_from_obj(Z_OBJ_P(zv))
 
-void curl_multi_register_class(const zend_function_entry *method_entries);
-void curl_share_register_class(const zend_function_entry *method_entries);
+void curl_multi_register_handlers(void);
+void curl_share_register_handlers(void);
 void curlfile_register_class(void);
 int curl_cast_object(zend_object *obj, zval *result, int type);
 
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -1177,10 +1177,7 @@ PHP_MINIT_FUNCTION(curl)
 		return FAILURE;
 	}
 
-	zend_class_entry ce;
-	INIT_CLASS_ENTRY(ce, "CurlHandle", class_CurlHandle_methods);
-	curl_ce = zend_register_internal_class(&ce);
-	curl_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+	curl_ce = register_class_CurlHandle();
 	curl_ce->create_object = curl_create_object;
 	curl_ce->serialize = zend_class_serialize_deny;
 	curl_ce->unserialize = zend_class_unserialize_deny;
@@ -1193,8 +1190,11 @@ PHP_MINIT_FUNCTION(curl)
 	curl_object_handlers.clone_obj = curl_clone_obj;
 	curl_object_handlers.cast_object = curl_cast_object;
 
-	curl_multi_register_class(class_CurlMultiHandle_methods);
-	curl_share_register_class(class_CurlShareHandle_methods);
+	curl_multi_ce = register_class_CurlMultiHandle();
+	curl_multi_register_handlers();
+
+	curl_share_ce = register_class_CurlShareHandle();
+	curl_share_register_handlers();
 	curlfile_register_class();
 
 	return SUCCESS;
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
@@ -580,11 +580,7 @@ static HashTable *curl_multi_get_gc(zend_object *object, zval **table, int *n)
 	return zend_std_get_properties(object);
 }
 
-void curl_multi_register_class(const zend_function_entry *method_entries) {
-	zend_class_entry ce_multi;
-	INIT_CLASS_ENTRY(ce_multi, "CurlMultiHandle", method_entries);
-	curl_multi_ce = zend_register_internal_class(&ce_multi);
-	curl_multi_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+void curl_multi_register_handlers(void) {
 	curl_multi_ce->create_object = curl_multi_create_object;
 	curl_multi_ce->serialize = zend_class_serialize_deny;
 	curl_multi_ce->unserialize = zend_class_unserialize_deny;
diff --git a/ext/curl/share.c b/ext/curl/share.c
@@ -162,11 +162,7 @@ void curl_share_free_obj(zend_object *object)
 	zend_object_std_dtor(&sh->std);
 }
 
-void curl_share_register_class(const zend_function_entry *method_entries) {
-	zend_class_entry ce_share;
-	INIT_CLASS_ENTRY(ce_share, "CurlShareHandle", method_entries);
-	curl_share_ce = zend_register_internal_class(&ce_share);
-	curl_share_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+void curl_share_register_handlers(void) {
 	curl_share_ce->create_object = curl_share_create_object;
 	curl_share_ce->serialize = &zend_class_serialize_deny;
 	curl_share_ce->unserialize = &zend_class_unserialize_deny;
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1603,10 +1603,7 @@ static int date_interval_has_property(zend_object *object, zend_string *name, in
 
 static void date_register_classes(void) /* {{{ */
 {
-	zend_class_entry ce_date, ce_immutable, ce_timezone, ce_interval, ce_period, ce_interface;
-
-	INIT_CLASS_ENTRY(ce_interface, "DateTimeInterface", class_DateTimeInterface_methods);
-	date_ce_interface = zend_register_internal_interface(&ce_interface);
+	date_ce_interface = register_class_DateTimeInterface();
 	date_ce_interface->interface_gets_implemented = implement_date_interface_handler;
 
 #define REGISTER_DATE_INTERFACE_CONST_STRING(const_name, value) \
@@ -1626,31 +1623,26 @@ static void date_register_classes(void) /* {{{ */
 	REGISTER_DATE_INTERFACE_CONST_STRING("RSS",              DATE_FORMAT_RFC1123);
 	REGISTER_DATE_INTERFACE_CONST_STRING("W3C",              DATE_FORMAT_RFC3339);
 
-	INIT_CLASS_ENTRY(ce_date, "DateTime", class_DateTime_methods);
-	ce_date.create_object = date_object_new_date;
-	date_ce_date = zend_register_internal_class_ex(&ce_date, NULL);
+	date_ce_date = register_class_DateTime(date_ce_interface);
+	date_ce_date->create_object = date_object_new_date;
 	memcpy(&date_object_handlers_date, &std_object_handlers, sizeof(zend_object_handlers));
 	date_object_handlers_date.offset = XtOffsetOf(php_date_obj, std);
 	date_object_handlers_date.free_obj = date_object_free_storage_date;
 	date_object_handlers_date.clone_obj = date_object_clone_date;
 	date_object_handlers_date.compare = date_object_compare_date;
 	date_object_handlers_date.get_properties_for = date_object_get_properties_for;
 	date_object_handlers_date.get_gc = date_object_get_gc;
-	zend_class_implements(date_ce_date, 1, date_ce_interface);
 
-	INIT_CLASS_ENTRY(ce_immutable, "DateTimeImmutable", class_DateTimeImmutable_methods);
-	ce_immutable.create_object = date_object_new_date;
-	date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, NULL);
+	date_ce_immutable = register_class_DateTimeImmutable(date_ce_interface);
+	date_ce_immutable->create_object = date_object_new_date;
 	memcpy(&date_object_handlers_immutable, &std_object_handlers, sizeof(zend_object_handlers));
 	date_object_handlers_immutable.clone_obj = date_object_clone_date;
 	date_object_handlers_immutable.compare = date_object_compare_date;
 	date_object_handlers_immutable.get_properties_for = date_object_get_properties_for;
 	date_object_handlers_immutable.get_gc = date_object_get_gc;
-	zend_class_implements(date_ce_immutable, 1, date_ce_interface);
 
-	INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", class_DateTimeZone_methods);
-	ce_timezone.create_object = date_object_new_timezone;
-	date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL);
+	date_ce_timezone = register_class_DateTimeZone();
+	date_ce_timezone->create_object = date_object_new_timezone;
 	memcpy(&date_object_handlers_timezone, &std_object_handlers, sizeof(zend_object_handlers));
 	date_object_handlers_timezone.offset = XtOffsetOf(php_timezone_obj, std);
 	date_object_handlers_timezone.free_obj = date_object_free_storage_timezone;
@@ -1678,9 +1670,8 @@ static void date_register_classes(void) /* {{{ */
 	REGISTER_TIMEZONE_CLASS_CONST_STRING("ALL_WITH_BC", PHP_DATE_TIMEZONE_GROUP_ALL_W_BC);
 	REGISTER_TIMEZONE_CLASS_CONST_STRING("PER_COUNTRY", PHP_DATE_TIMEZONE_PER_COUNTRY);
 
-	INIT_CLASS_ENTRY(ce_interval, "DateInterval", class_DateInterval_methods);
-	ce_interval.create_object = date_object_new_interval;
-	date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL);
+	date_ce_interval = register_class_DateInterval();
+	date_ce_interval->create_object = date_object_new_interval;
 	memcpy(&date_object_handlers_interval, &std_object_handlers, sizeof(zend_object_handlers));
 	date_object_handlers_interval.offset = XtOffsetOf(php_interval_obj, std);
 	date_object_handlers_interval.free_obj = date_object_free_storage_interval;
@@ -1693,11 +1684,9 @@ static void date_register_classes(void) /* {{{ */
 	date_object_handlers_interval.get_gc = date_object_get_gc_interval;
 	date_object_handlers_interval.compare = date_interval_compare_objects;
 
-	INIT_CLASS_ENTRY(ce_period, "DatePeriod", class_DatePeriod_methods);
-	ce_period.create_object = date_object_new_period;
-	date_ce_period = zend_register_internal_class_ex(&ce_period, NULL);
+	date_ce_period = register_class_DatePeriod(zend_ce_aggregate);
+	date_ce_period->create_object = date_object_new_period;
 	date_ce_period->get_iterator = date_object_period_get_iterator;
-	zend_class_implements(date_ce_period, 1, zend_ce_aggregate);
 	memcpy(&date_object_handlers_period, &std_object_handlers, sizeof(zend_object_handlers));
 	date_object_handlers_period.offset = XtOffsetOf(php_period_obj, std);
 	date_object_handlers_period.free_obj = date_object_free_storage_period;
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 function strtotime(string $datetime, ?int $baseTimestamp = null): int|false {}
 
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 880a93d8a3461635447318317869fa7d3d7762dd */
+ * Stub hash: fde1c48b5ad92f574ac049101f421232c6a64252 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -657,3 +657,67 @@ static const zend_function_entry class_DatePeriod_methods[] = {
 	ZEND_ME(DatePeriod, getIterator, arginfo_class_DatePeriod_getIterator, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+zend_class_entry *register_class_DateTimeInterface()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DateTimeInterface", class_DateTimeInterface_methods);
+	class_entry = zend_register_internal_interface(&ce);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_DateTime(zend_class_entry *class_entry_DateTimeInterface)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DateTime", class_DateTime_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	zend_class_implements(class_entry, 1, class_entry_DateTimeInterface);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_DateTimeImmutable(zend_class_entry *class_entry_DateTimeInterface)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DateTimeImmutable", class_DateTimeImmutable_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	zend_class_implements(class_entry, 1, class_entry_DateTimeInterface);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_DateTimeZone()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DateTimeZone", class_DateTimeZone_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_DateInterval()
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DateInterval", class_DateInterval_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
+zend_class_entry *register_class_DatePeriod(zend_class_entry *class_entry_IteratorAggregate)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DatePeriod", class_DatePeriod_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	zend_class_implements(class_entry, 1, class_entry_IteratorAggregate);
+
+	return class_entry;
+}
+
diff --git a/ext/dba/dba.stub.php b/ext/dba/dba.stub.php
@@ -1,6 +1,9 @@
 <?php
 
-/** @generate-function-entries */
+/**
+ * @generate-function-entries
+ * @generate-class-entries
+ */
 
 /**
  * @param string $path
diff --git a/ext/dba/dba_arginfo.h b/ext/dba/dba_arginfo.h
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,21 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-/** @generate-function-entries */`
	`3`	`+/**`
	`4`	`+ * @generate-function-entries`
	`5`	`+ * @generate-class-entries`
	`6`	`+ */`
`4`	`7`
	`8`	`+/** @strict-properties */`
`5`	`9`	`final class CurlHandle`
`6`	`10`	`{`
`7`	`11`	`}`
`8`	`12`
	`13`	`+/** @strict-properties */`
`9`	`14`	`final class CurlMultiHandle`
`10`	`15`	`{`
`11`	`16`	`}`
`12`	`17`
	`18`	`+/** @strict-properties */`
`13`	`19`	`final class CurlShareHandle`
`14`	`20`	`{`
`15`	`21`	`}`