Close GH-16659: Bump ICU requirement to ICU >= 57.1

This requirements bump should rarely affect anybody in practice.  All
major distros already ship more recent ICU versions, and even for
Solaris 11, ICU 57.1 is available via OpenCSW.  Note that ICU 57.1 has
been released on 2016-03-23[1].

[1] <https://icu.unicode.org/download/57>

Closes GH-16688.

Author: cmb69

NEWS

@@ -16,6 +16,9 @@ PHP                                                                        NEWS
   . Added Dom\Element::$outerHTML. (nielsdos)
   . Added Dom\Element::insertAdjacentHTML(). (nielsdos)
 
+- Intl:
+  . Bumped ICU requirement to ICU >= 57.1. (cmb)
+
 - Output:
   . Fixed calculation of aligned buffer size. (cmb)
 

UPGRADING

@@ -29,6 +29,9 @@ PHP 8.5 UPGRADE NOTES
   . It is no longer possible to use "array" and "callable" as class alias names
     in class_alias().
 
+- Intl:
+  . The extension now requires at least ICU 57.1.
+
 - LDAP:
   . ldap_get_option() and ldap_set_option() now throw a ValueError when
     passing an invalid option.

build/php.m4

@@ -1779,7 +1779,7 @@ dnl
 dnl Common setup macro for ICU.
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
-  PKG_CHECK_MODULES([ICU], [icu-uc >= 50.1 icu-io icu-i18n])
+  PKG_CHECK_MODULES([ICU], [icu-uc >= 57.1 icu-io icu-i18n])
 
   PHP_EVAL_INCLINE([$ICU_CFLAGS])
   PHP_EVAL_LIBLINE([$ICU_LIBS], [$1])

ext/intl/formatter/formatter.stub.php

@@ -27,10 +27,8 @@ class NumberFormatter
     public const int PATTERN_RULEBASED = UNKNOWN;
     /** @cvalue UNUM_IGNORE */
     public const int IGNORE = UNKNOWN;
-#if U_ICU_VERSION_MAJOR_NUM >= 53
     /** @cvalue UNUM_CURRENCY_ACCOUNTING */
     public const int CURRENCY_ACCOUNTING = UNKNOWN;
-#endif
     /** @cvalue UNUM_DEFAULT */
     public const int DEFAULT_STYLE = UNKNOWN;
 

ext/intl/formatter/formatter_arginfo.h

@@ -17,19 +17,6 @@
 
 #include <php.h>
 #include <unicode/utypes.h>
-#if U_ICU_VERSION_MAJOR_NUM < 56
-#include <unicode/unorm.h>
-
-#define NORMALIZER_FORM_D UNORM_NFD
-#define NORMALIZER_NFD UNORM_NFD
-#define NORMALIZER_FORM_KD UNORM_NFKD
-#define NORMALIZER_NFKD UNORM_NFKD
-#define NORMALIZER_FORM_C UNORM_NFC
-#define NORMALIZER_NFC UNORM_NFC
-#define NORMALIZER_FORM_KC UNORM_NFKC
-#define NORMALIZER_NFKC UNORM_NFKC
-#define NORMALIZER_DEFAULT UNORM_DEFAULT
-#else
 #include <unicode/unorm2.h>
 
 #define NORMALIZER_FORM_D 0x4
@@ -43,6 +30,5 @@
 #define NORMALIZER_FORM_KC_CF 0x30
 #define NORMALIZER_NFKC_CF NORMALIZER_FORM_KC_CF
 #define NORMALIZER_DEFAULT NORMALIZER_FORM_C
-#endif
 
 #endif // NORMALIZER_NORMALIZER_H

ext/intl/normalizer/normalizer.h

@@ -20,12 +20,10 @@ class Normalizer
     public const int FORM_KC = UNKNOWN;
     /** @cvalue NORMALIZER_NFKC */
     public const int NFKC = UNKNOWN;
-#if U_ICU_VERSION_MAJOR_NUM >= 56
     /** @cvalue NORMALIZER_FORM_KC_CF */
     public const int FORM_KC_CF = UNKNOWN;
     /** @cvalue NORMALIZER_NFKC_CF */
     public const int NFKC_CF = UNKNOWN;
-#endif
 
     /**
      * @tentative-return-type
@@ -39,11 +37,9 @@ public static function normalize(string $string, int $form = Normalizer::FORM_C)
      */
     public static function isNormalized(string $string, int $form = Normalizer::FORM_C): bool {}
 
-#if U_ICU_VERSION_MAJOR_NUM >= 56
     /**
      * @tentative-return-type
      * @alias normalizer_get_raw_decomposition
      */
     public static function getRawDecomposition(string $string, int $form = Normalizer::FORM_C): ?string {}
-#endif
 }

ext/intl/normalizer/normalizer.stub.php

@@ -17,18 +17,13 @@
 #endif
 
 #include "php_intl.h"
-#if U_ICU_VERSION_MAJOR_NUM < 56
-#include "unicode/unorm.h"
-#else
 #include <unicode/unorm2.h>
-#endif
 #include "normalizer.h"
 #include "normalizer_class.h"
 #include "intl_convert.h"
 #include <unicode/utf8.h>
 
 
-#if U_ICU_VERSION_MAJOR_NUM >= 56
 static const UNormalizer2 *intl_get_normalizer(zend_long form, UErrorCode *err)
 {/*{{{*/
 	switch (form)
@@ -74,7 +69,6 @@ static UBool intl_is_normalized(zend_long form, const UChar *uinput, int32_t uin
 
 	return unorm2_isNormalized(norm, uinput, uinput_len, err);
 }/*}}}*/
-#endif
 
 /* {{{ Normalize a string. */
 PHP_FUNCTION( normalizer_normalize )
@@ -116,9 +110,7 @@ PHP_FUNCTION( normalizer_normalize )
 			break;
 		case NORMALIZER_FORM_C:
 		case NORMALIZER_FORM_KC:
-#if U_ICU_VERSION_MAJOR_NUM >= 56
 		case NORMALIZER_FORM_KC_CF:
-#endif
 			break;
 		default:
 			zend_argument_value_error(2, "must be a a valid normalization form");
@@ -151,11 +143,7 @@ PHP_FUNCTION( normalizer_normalize )
 	uret_buf = eumalloc( uret_len + 1 );
 
 	/* normalize */
-#if U_ICU_VERSION_MAJOR_NUM < 56
-	size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
-#else
 	size_needed = intl_normalize(form, uinput, uinput_len, uret_buf, uret_len, &status);
-#endif
 
 	/* Bail out if an unexpected error occurred.
 	 * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
@@ -179,11 +167,7 @@ PHP_FUNCTION( normalizer_normalize )
 		status = U_ZERO_ERROR;
 
 		/* try normalize again */
-#if U_ICU_VERSION_MAJOR_NUM < 56
-		size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
-#else
 		size_needed = intl_normalize(form, uinput, uinput_len, uret_buf, uret_len, &status);
-#endif
 
 		/* Bail out if an unexpected error occurred. */
 		if( U_FAILURE(status)  ) {
@@ -243,9 +227,7 @@ PHP_FUNCTION( normalizer_is_normalized )
 		case NORMALIZER_FORM_KD:
 		case NORMALIZER_FORM_C:
 		case NORMALIZER_FORM_KC:
-#if U_ICU_VERSION_MAJOR_NUM >= 56
 		case NORMALIZER_FORM_KC_CF:
-#endif
 			break;
 		default:
 			zend_argument_value_error(2, "must be a a valid normalization form");
@@ -275,11 +257,7 @@ PHP_FUNCTION( normalizer_is_normalized )
 
 
 	/* test string */
-#if U_ICU_VERSION_MAJOR_NUM < 56
-	uret = unorm_isNormalizedWithOptions( uinput, uinput_len, form, (int32_t) 0 /* options */, &status);
-#else
 	uret = intl_is_normalized(form, uinput, uinput_len, &status);
-#endif
 
 	efree( uinput );
 
@@ -298,7 +276,6 @@ PHP_FUNCTION( normalizer_is_normalized )
 /* }}} */
 
 /* {{{ Returns the Decomposition_Mapping property for the given UTF-8 encoded code point. */
-#if U_ICU_VERSION_MAJOR_NUM >= 56
 PHP_FUNCTION( normalizer_get_raw_decomposition )
 {
 	char* input = NULL;
@@ -344,5 +321,4 @@ PHP_FUNCTION( normalizer_get_raw_decomposition )
 
 	RETVAL_NEW_STR(intl_convert_utf16_to_utf8(decomposition, decomposition_length, &status));
 }
-#endif
 /* }}} */

ext/intl/normalizer/normalizer_arginfo.h

@@ -537,9 +537,7 @@ function normalizer_normalize(string $string, int $form = Normalizer::FORM_C): s
 
 function normalizer_is_normalized(string $string, int $form = Normalizer::FORM_C): bool {}
 
-#if U_ICU_VERSION_MAJOR_NUM >= 56
 function normalizer_get_raw_decomposition(string $string, int $form = Normalizer::FORM_C): ?string {}
-#endif
 
 /* resourceboundle */
 
@@ -605,11 +603,9 @@ function intltz_get_tz_data_version(): string|false {}
 
 function intltz_get_unknown(): IntlTimeZone {}
 
-#if U_ICU_VERSION_MAJOR_NUM >= 52
 function intltz_get_windows_id(string $timezoneId): string|false {}
 
 function intltz_get_id_for_windows_id(string $timezoneId, ?string $region = null): string|false {}
-#endif
 
 function intltz_has_same_rules(IntlTimeZone $timezone, IntlTimeZone $other): bool {}
 

ext/intl/normalizer/normalizer_normalize.c

@@ -3,7 +3,6 @@ IntlBreakIterator::getLocale(): basic test
 --EXTENSIONS--
 intl
 --SKIPIF--
-<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '64.0') >= 0) die('skip for ICU < 64.0'); ?>
 --FILE--
 <?php