IntlDatePatternGenerator: remove legacy procedural API

Author: Mel Dafert

ext/intl/dateformat/datepatterngenerator.stub.php

@@ -6,13 +6,7 @@ class IntlDatePatternGenerator
 {
     public function __construct(?string $locale = null) {}
 
-    /**
-     * @alias datepatterngenerator_create
-     */
     public static function create(?string $locale = null): ?IntlDatePatternGenerator {}
 
-    /**
-     * @alias datepatterngenerator_get_best_pattern
-     */
     public function getBestPattern(string $skeleton): string|false {}
 }

ext/intl/dateformat/datepatterngenerator_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 04893f966115e4ec08650e04e18cb4ff9f80a842 */
+ * Stub hash: 74026c524046787844da9f8132029735243176c6 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDatePatternGenerator___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
@@ -15,14 +15,14 @@ ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(IntlDatePatternGenerator, __construct);
-ZEND_FUNCTION(datepatterngenerator_create);
-ZEND_FUNCTION(datepatterngenerator_get_best_pattern);
+ZEND_METHOD(IntlDatePatternGenerator, create);
+ZEND_METHOD(IntlDatePatternGenerator, getBestPattern);
 
 
 static const zend_function_entry class_IntlDatePatternGenerator_methods[] = {
 	ZEND_ME(IntlDatePatternGenerator, __construct, arginfo_class_IntlDatePatternGenerator___construct, ZEND_ACC_PUBLIC)
-	ZEND_ME_MAPPING(create, datepatterngenerator_create, arginfo_class_IntlDatePatternGenerator_create, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	ZEND_ME_MAPPING(getBestPattern, datepatterngenerator_get_best_pattern, arginfo_class_IntlDatePatternGenerator_getBestPattern, ZEND_ACC_PUBLIC)
+	ZEND_ME(IntlDatePatternGenerator, create, arginfo_class_IntlDatePatternGenerator_create, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_ME(IntlDatePatternGenerator, getBestPattern, arginfo_class_IntlDatePatternGenerator_getBestPattern, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
 

ext/intl/dateformat/datepatterngenerator_methods.cpp

@@ -74,7 +74,7 @@ static zend_result dtpg_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	return U_FAILURE(intl_error_get_code(NULL)) ? FAILURE : SUCCESS;
 }
 
-U_CFUNC PHP_FUNCTION( datepatterngenerator_create )
+U_CFUNC PHP_METHOD( IntlDatePatternGenerator, create )
 {
     object_init_ex( return_value, IntlDatePatternGenerator_ce_ptr );
     if (dtpg_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
@@ -102,7 +102,7 @@ U_CFUNC PHP_METHOD( IntlDatePatternGenerator, __construct )
 }
 
 
-U_CFUNC PHP_FUNCTION(datepatterngenerator_get_best_pattern)
+U_CFUNC PHP_METHOD( IntlDatePatternGenerator, getBestPattern )
 {
 	char			*skeleton_str	= NULL;
 	size_t			skeleton_len;

ext/intl/php_intl.stub.php

@@ -213,10 +213,6 @@ function datefmt_get_error_code(IntlDateFormatter $formatter): int {}
 
 function datefmt_get_error_message(IntlDateFormatter $formatter): string {}
 
-function datepatterngenerator_create(?string $locale = null): ?IntlDatePatternGenerator {}
-
-function datepatterngenerator_get_best_pattern(IntlDatePatternGenerator $patternGenerator, string $skeleton): string|false {}
-
 /* formatter */
 
 function numfmt_create(string $locale, int $style, ?string $pattern = null): ?NumberFormatter {}

ext/intl/php_intl_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 770f8e5a0df2f52b217af7d1145cb799a9bf0187 */
+ * Stub hash: 0d3e65fea1fbb8f38c3268b4048cb91972a94a1b */
 
 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")
@@ -367,15 +367,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_get_error_message, 0, 1,
 	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_datepatterngenerator_create, 0, 0, IntlDatePatternGenerator, 1)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datepatterngenerator_get_best_pattern, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, patternGenerator, IntlDatePatternGenerator, 0)
-	ZEND_ARG_TYPE_INFO(0, skeleton, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_numfmt_create, 0, 2, NumberFormatter, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0)
@@ -881,8 +872,6 @@ ZEND_FUNCTION(datefmt_parse);
 ZEND_FUNCTION(datefmt_localtime);
 ZEND_FUNCTION(datefmt_get_error_code);
 ZEND_FUNCTION(datefmt_get_error_message);
-ZEND_FUNCTION(datepatterngenerator_create);
-ZEND_FUNCTION(datepatterngenerator_get_best_pattern);
 ZEND_FUNCTION(numfmt_create);
 ZEND_FUNCTION(numfmt_format);
 ZEND_FUNCTION(numfmt_parse);
@@ -1073,8 +1062,6 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(datefmt_localtime, arginfo_datefmt_localtime)
 	ZEND_FE(datefmt_get_error_code, arginfo_datefmt_get_error_code)
 	ZEND_FE(datefmt_get_error_message, arginfo_datefmt_get_error_message)
-	ZEND_FE(datepatterngenerator_create, arginfo_datepatterngenerator_create)
-	ZEND_FE(datepatterngenerator_get_best_pattern, arginfo_datepatterngenerator_get_best_pattern)
 	ZEND_FE(numfmt_create, arginfo_numfmt_create)
 	ZEND_FE(numfmt_format, arginfo_numfmt_format)
 	ZEND_FE(numfmt_parse, arginfo_numfmt_parse)

ext/intl/tests/datepatterngenerator_get_best_pattern.phpt

@@ -21,8 +21,6 @@ echo $dtpg4->getBestPattern("YYYYMMMdd"), "\n";
 
 echo $dtpg->getBestPattern(""), "\n";
 
-echo datepatterngenerator_get_best_pattern(datepatterngenerator_create(), "YYYYMMMdd"), "\n";
-
 try {
     $dtpg->getBestPattern();
 } catch(\ArgumentCountError $e) {
@@ -36,5 +34,4 @@ HH:mm
 MMM dd, YYYY
 dd. MMM YYYY
 
-MMM dd, YYYY
 IntlDatePatternGenerator::getBestPattern() expects exactly 1 argument, 0 given