split MINIT for WeekInfo

remicollet · remicollet · commit 22c5bcdd33fd · 2023-08-28T09:47:30.000+02:00
diff --git a/package.xml b/package.xml
@@ -91,6 +91,8 @@ Fix: remove package.xml from manifest to avoid md5 checksum errors when installi
             <file name="locale_week_day.h" role="src"/>
             <file name="locale_week_info.c" role="src"/>
             <file name="locale_week_info.h" role="src"/>
+            <file name="locale_week_info_arginfo.h" role="src"/>
+            <file name="locale_week_info.stub.php" role="src"/>
           </dir>
           <file name="ecma_intl.c" role="src"/>
           <file name="ecma_intl.h" role="src"/>
diff --git a/src/php/classes/locale_week_info.c b/src/php/classes/locale_week_info.c
@@ -14,6 +14,8 @@
 
 #include "php/classes/locale_week_day.h"
 
+#include "php/classes/locale_week_info_arginfo.h"
+
 #include <ext/json/php_json.h>
 
 zend_class_entry *ecma_ce_IntlLocaleWeekInfo = NULL;
@@ -121,3 +123,9 @@ static void freeLocaleWeekInfoObj(zend_object *object) {
       ecma_IntlLocaleWeekInfoFromObj(object);
   zend_object_std_dtor(&intlLocaleWeekInfo->std);
 }
+
+PHP_MINIT_FUNCTION(ecma_intl_locale_weekinfo) {
+  registerEcmaIntlLocaleWeekInfo();
+
+  return SUCCESS;
+}
diff --git a/src/php/classes/locale_week_info.h b/src/php/classes/locale_week_info.h
@@ -33,4 +33,6 @@ extern zend_object_handlers ecma_handlers_IntlLocaleWeekInfo;
 void registerEcmaIntlLocaleWeekInfo(void);
 zend_object *ecma_createIntlLocaleWeekInfo(zend_class_entry *classEntry);
 
+PHP_MINIT_FUNCTION(ecma_intl_locale_weekinfo);
+
 #endif /* ECMA_INTL_PHP_CLASSES_LOCALE_WEEK_INFO_H */
diff --git a/src/php/classes/locale_week_info.stub.php b/src/php/classes/locale_week_info.stub.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * Copyright (c) php-ecma-intl contributors.
+ *
+ * This source file is subject to the BSD-3-Clause license that is bundled with
+ * this package in the file LICENSE and is available at the following web
+ * address: https://opensource.org/license/bsd-3-clause/
+ *
+ * This source file may utilize copyrighted material from third-party open
+ * source projects, the use of which is acknowledged in the NOTICE file bundled
+ * with this package.
+ *
+ * @generate-class-entries
+ */
+
+namespace Ecma\Intl\Locale
+{
+    /**
+     * WeekInfo represents locale-specific information about the days of the
+     * week, for calendar purposes.
+     *
+     * @link https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo Intl Locale Info Proposal: getTextInfo()
+     * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getWeekInfo Intl.Locale.prototype.getWeekInfo()
+     * @link https://www.unicode.org/reports/tr35/tr35-dates.html#Date_Patterns_Week_Elements UTS 35: Week Elements
+     */
+    readonly class WeekInfo implements \JsonSerializable
+    {
+        /**
+         * The week day that is considered the first day of the week
+         * for the locale.
+         */
+        public readonly WeekDay $firstDay;
+
+        /**
+         * The minimum days required in the first week of a month or year
+         * for the locale.
+         *
+         * @phpstan-var int<1, 7>
+         */
+        public readonly int $minimalDays;
+
+        /**
+         * A list of week days that are considered part of the weekend
+         * for the locale.
+         *
+         * Please note, the number of weekend days in each locale may be
+         * different, and they may not be contiguous.
+         *
+         * @var WeekDay[]
+         */
+        public readonly array $weekend;
+
+        /**
+         * WeekInfo represents locale-specific information about the days of the
+         * week, for calendar purposes.
+         *
+         * @link https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo Intl Locale Info Proposal: getTextInfo()
+         * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getWeekInfo Intl.Locale.prototype.getWeekInfo()
+         * @link https://www.unicode.org/reports/tr35/tr35-dates.html#Date_Patterns_Week_Elements UTS 35: Week Elements
+         *
+         * @param WeekDay $firstDay The week day that is considered the _first_ day of the week.
+         * @param WeekDay[] $weekend A list of week days that are considered part of the weekend.
+         * @phpstan-param int<1, 7> $minimalDays The minimum days required in the first week of a month or year.
+         */
+        public function __construct(
+            WeekDay $firstDay,
+            array $weekend,
+            int $minimalDays,
+        ) {
+        }
+
+        /**
+         * Returns an object of WeekInfo properties and their values, suitable
+         * for serializing to JSON.
+         *
+         * @return object
+         */
+        public function jsonSerialize(): object
+        {
+        }
+    }
+}
diff --git a/src/php/classes/locale_week_info_arginfo.h b/src/php/classes/locale_week_info_arginfo.h
@@ -0,0 +1,53 @@
+/* This is a generated file, edit the .stub.php file instead.
+ * Stub hash: 3051c3b438167cf62f52ffb9330009339345353b */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Ecma_Intl_Locale_WeekInfo___construct, 0, 0, 3)
+	ZEND_ARG_OBJ_INFO(0, firstDay, Ecma\\Intl\\Locale\\WeekDay, 0)
+	ZEND_ARG_TYPE_INFO(0, weekend, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, minimalDays, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Ecma_Intl_Locale_WeekInfo_jsonSerialize, 0, 0, IS_OBJECT, 0)
+ZEND_END_ARG_INFO()
+
+
+ZEND_METHOD(Ecma_Intl_Locale_WeekInfo, __construct);
+ZEND_METHOD(Ecma_Intl_Locale_WeekInfo, jsonSerialize);
+
+
+static const zend_function_entry class_Ecma_Intl_Locale_WeekInfo_methods[] = {
+	ZEND_ME(Ecma_Intl_Locale_WeekInfo, __construct, arginfo_class_Ecma_Intl_Locale_WeekInfo___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(Ecma_Intl_Locale_WeekInfo, jsonSerialize, arginfo_class_Ecma_Intl_Locale_WeekInfo_jsonSerialize, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+static zend_class_entry *register_class_Ecma_Intl_Locale_WeekInfo(zend_class_entry *class_entry_JsonSerializable)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_NS_CLASS_ENTRY(ce, "Ecma\\Intl\\Locale", "WeekInfo", class_Ecma_Intl_Locale_WeekInfo_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_READONLY_CLASS;
+	zend_class_implements(class_entry, 1, class_entry_JsonSerializable);
+
+	zend_string *property_firstDay_class_Ecma_Intl_Locale_WeekDay = zend_string_init("Ecma\\Intl\\Locale\\WeekDay", sizeof("Ecma\\Intl\\Locale\\WeekDay")-1, 1);
+	zval property_firstDay_default_value;
+	ZVAL_UNDEF(&property_firstDay_default_value);
+	zend_string *property_firstDay_name = zend_string_init("firstDay", sizeof("firstDay") - 1, 1);
+	zend_declare_typed_property(class_entry, property_firstDay_name, &property_firstDay_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_firstDay_class_Ecma_Intl_Locale_WeekDay, 0, 0));
+	zend_string_release(property_firstDay_name);
+
+	zval property_minimalDays_default_value;
+	ZVAL_UNDEF(&property_minimalDays_default_value);
+	zend_string *property_minimalDays_name = zend_string_init("minimalDays", sizeof("minimalDays") - 1, 1);
+	zend_declare_typed_property(class_entry, property_minimalDays_name, &property_minimalDays_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
+	zend_string_release(property_minimalDays_name);
+
+	zval property_weekend_default_value;
+	ZVAL_UNDEF(&property_weekend_default_value);
+	zend_string *property_weekend_name = zend_string_init("weekend", sizeof("weekend") - 1, 1);
+	zend_declare_typed_property(class_entry, property_weekend_name, &property_weekend_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY));
+	zend_string_release(property_weekend_name);
+
+	return class_entry;
+}
diff --git a/src/php/ecma_intl.c b/src/php/ecma_intl.c
@@ -54,7 +54,7 @@ PHP_MINIT_FUNCTION(ecma_intl) {
   registerEcmaIntlLocaleOptions();
   registerEcmaIntlLocaleTextInfo();
   registerEcmaIntlLocaleWeekDay();
-  registerEcmaIntlLocaleWeekInfo();
+  PHP_MINIT(ecma_intl_locale_weekinfo)(INIT_FUNC_ARGS_PASSTHRU);
 
   return SUCCESS;
 }
diff --git a/src/php/ecma_intl.stub.php b/src/php/ecma_intl.stub.php
@@ -727,69 +727,4 @@ enum WeekDay: int
         case Saturday = 6;
         case Sunday = 7;
     }
-
-    /**
-     * WeekInfo represents locale-specific information about the days of the
-     * week, for calendar purposes.
-     *
-     * @link https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo Intl Locale Info Proposal: getTextInfo()
-     * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getWeekInfo Intl.Locale.prototype.getWeekInfo()
-     * @link https://www.unicode.org/reports/tr35/tr35-dates.html#Date_Patterns_Week_Elements UTS 35: Week Elements
-     */
-    readonly class WeekInfo implements \JsonSerializable
-    {
-        /**
-         * The week day that is considered the first day of the week
-         * for the locale.
-         */
-        public readonly WeekDay $firstDay;
-
-        /**
-         * The minimum days required in the first week of a month or year
-         * for the locale.
-         *
-         * @phpstan-var int<1, 7>
-         */
-        public readonly int $minimalDays;
-
-        /**
-         * A list of week days that are considered part of the weekend
-         * for the locale.
-         *
-         * Please note, the number of weekend days in each locale may be
-         * different, and they may not be contiguous.
-         *
-         * @var WeekDay[]
-         */
-        public readonly array $weekend;
-
-        /**
-         * WeekInfo represents locale-specific information about the days of the
-         * week, for calendar purposes.
-         *
-         * @link https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo Intl Locale Info Proposal: getTextInfo()
-         * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getWeekInfo Intl.Locale.prototype.getWeekInfo()
-         * @link https://www.unicode.org/reports/tr35/tr35-dates.html#Date_Patterns_Week_Elements UTS 35: Week Elements
-         *
-         * @param WeekDay $firstDay The week day that is considered the _first_ day of the week.
-         * @param WeekDay[] $weekend A list of week days that are considered part of the weekend.
-         * @phpstan-param int<1, 7> $minimalDays The minimum days required in the first week of a month or year.
-         */
-        public function __construct(
-            WeekDay $firstDay,
-            array $weekend,
-            int $minimalDays,
-        ) {
-        }
-
-        /**
-         * Returns an object of WeekInfo properties and their values, suitable
-         * for serializing to JSON.
-         *
-         * @return object
-         */
-        public function jsonSerialize(): object
-        {
-        }
-    }
 }
diff --git a/src/php/ecma_intl_arginfo.h b/src/php/ecma_intl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7ddfa21a419a4884073bf5764537976a096ec5d3 */
+ * Stub hash: 072a04a13d5217758e021d976cd7ca954937a184 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Ecma_Intl_getCanonicalLocales, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, locales, Traversable|Stringable, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, NULL)
@@ -83,14 +83,6 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Ecma_Intl_Locale_TextInfo_jsonSerialize arginfo_class_Ecma_Intl_Locale_jsonSerialize
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Ecma_Intl_Locale_WeekInfo___construct, 0, 0, 3)
-	ZEND_ARG_OBJ_INFO(0, firstDay, Ecma\\Intl\\Locale\\WeekDay, 0)
-	ZEND_ARG_TYPE_INFO(0, weekend, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, minimalDays, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_Ecma_Intl_Locale_WeekInfo_jsonSerialize arginfo_class_Ecma_Intl_Locale_jsonSerialize
-
 
 ZEND_METHOD(Ecma_Intl, getCanonicalLocales);
 ZEND_METHOD(Ecma_Intl, supportedValuesOf);
@@ -117,8 +109,6 @@ ZEND_METHOD(Ecma_Intl_Locale_Options, valid);
 ZEND_METHOD(Ecma_Intl_Locale_Options, rewind);
 ZEND_METHOD(Ecma_Intl_Locale_TextInfo, __construct);
 ZEND_METHOD(Ecma_Intl_Locale_TextInfo, jsonSerialize);
-ZEND_METHOD(Ecma_Intl_Locale_WeekInfo, __construct);
-ZEND_METHOD(Ecma_Intl_Locale_WeekInfo, jsonSerialize);
 
 
 static const zend_function_entry class_Ecma_Intl_methods[] = {
@@ -181,13 +171,6 @@ static const zend_function_entry class_Ecma_Intl_Locale_WeekDay_methods[] = {
 	ZEND_FE_END
 };
 
-
-static const zend_function_entry class_Ecma_Intl_Locale_WeekInfo_methods[] = {
-	ZEND_ME(Ecma_Intl_Locale_WeekInfo, __construct, arginfo_class_Ecma_Intl_Locale_WeekInfo___construct, ZEND_ACC_PUBLIC)
-	ZEND_ME(Ecma_Intl_Locale_WeekInfo, jsonSerialize, arginfo_class_Ecma_Intl_Locale_WeekInfo_jsonSerialize, ZEND_ACC_PUBLIC)
-	ZEND_FE_END
-};
-
 static zend_class_entry *register_class_Ecma_Intl(void)
 {
 	zend_class_entry ce, *class_entry;
@@ -508,34 +491,3 @@ static zend_class_entry *register_class_Ecma_Intl_Locale_WeekDay(void)
 
 	return class_entry;
 }
-
-static zend_class_entry *register_class_Ecma_Intl_Locale_WeekInfo(zend_class_entry *class_entry_JsonSerializable)
-{
-	zend_class_entry ce, *class_entry;
-
-	INIT_NS_CLASS_ENTRY(ce, "Ecma\\Intl\\Locale", "WeekInfo", class_Ecma_Intl_Locale_WeekInfo_methods);
-	class_entry = zend_register_internal_class_ex(&ce, NULL);
-	class_entry->ce_flags |= ZEND_ACC_READONLY_CLASS;
-	zend_class_implements(class_entry, 1, class_entry_JsonSerializable);
-
-	zend_string *property_firstDay_class_Ecma_Intl_Locale_WeekDay = zend_string_init("Ecma\\Intl\\Locale\\WeekDay", sizeof("Ecma\\Intl\\Locale\\WeekDay")-1, 1);
-	zval property_firstDay_default_value;
-	ZVAL_UNDEF(&property_firstDay_default_value);
-	zend_string *property_firstDay_name = zend_string_init("firstDay", sizeof("firstDay") - 1, 1);
-	zend_declare_typed_property(class_entry, property_firstDay_name, &property_firstDay_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_firstDay_class_Ecma_Intl_Locale_WeekDay, 0, 0));
-	zend_string_release(property_firstDay_name);
-
-	zval property_minimalDays_default_value;
-	ZVAL_UNDEF(&property_minimalDays_default_value);
-	zend_string *property_minimalDays_name = zend_string_init("minimalDays", sizeof("minimalDays") - 1, 1);
-	zend_declare_typed_property(class_entry, property_minimalDays_name, &property_minimalDays_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
-	zend_string_release(property_minimalDays_name);
-
-	zval property_weekend_default_value;
-	ZVAL_UNDEF(&property_weekend_default_value);
-	zend_string *property_weekend_name = zend_string_init("weekend", sizeof("weekend") - 1, 1);
-	zend_declare_typed_property(class_entry, property_weekend_name, &property_weekend_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY));
-	zend_string_release(property_weekend_name);
-
-	return class_entry;
-}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ PHP_MINIT_FUNCTION(ecma_intl) {`
`54`	`54`	`registerEcmaIntlLocaleOptions();`
`55`	`55`	`registerEcmaIntlLocaleTextInfo();`
`56`	`56`	`registerEcmaIntlLocaleWeekDay();`
`57`		`- registerEcmaIntlLocaleWeekInfo();`
	`57`	`+ PHP_MINIT(ecma_intl_locale_weekinfo)(INIT_FUNC_ARGS_PASSTHRU);`
`58`	`58`
`59`	`59`	`return SUCCESS;`
`60`	`60`	`}`