Remove intl Normalizer::NONE

Author: nikic

UPGRADING

@@ -61,6 +61,7 @@ PHP 8.0 UPGRADE NOTES
 - Intl:
   . The deprecated constant INTL_IDNA_VARIANT_2003 has been removed.
     RFC: https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
+  . The deprecated Normalizer::NONE constant has been removed.
 
 - Mbstring:
   . The mbstring.func_overload directive has been removed. The related

ext/intl/normalizer/normalizer.c

@@ -42,7 +42,6 @@ void normalizer_register_constants( INIT_FUNC_ARGS )
 	#define NORMALIZER_EXPOSE_CUSTOM_CLASS_CONST(name, value) zend_declare_class_constant_long( Normalizer_ce_ptr, ZEND_STRS( name ) - 1, value );
 
 	/* Normalization form constants */
-	NORMALIZER_EXPOSE_CLASS_CONST( NONE );
 	NORMALIZER_EXPOSE_CLASS_CONST( FORM_D );
 	NORMALIZER_EXPOSE_CLASS_CONST( NFD );
 	NORMALIZER_EXPOSE_CLASS_CONST( FORM_KD );

ext/intl/normalizer/normalizer.h

@@ -22,7 +22,6 @@
 #if U_ICU_VERSION_MAJOR_NUM < 56
 #include <unicode/unorm.h>
 
-#define NORMALIZER_NONE UNORM_NONE
 #define NORMALIZER_FORM_D UNORM_NFD
 #define NORMALIZER_NFD UNORM_NFD
 #define NORMALIZER_FORM_KD UNORM_NFKD
@@ -35,7 +34,6 @@
 #else
 #include <unicode/unorm2.h>
 
-#define NORMALIZER_NONE 0x2
 #define NORMALIZER_FORM_D 0x4
 #define NORMALIZER_NFD NORMALIZER_FORM_D
 #define NORMALIZER_FORM_KD 0x8

ext/intl/normalizer/normalizer_normalize.c

@@ -59,26 +59,8 @@ static const UNormalizer2 *intl_get_normalizer(zend_long form, UErrorCode *err)
 
 static int32_t intl_normalize(zend_long form, const UChar *src, int32_t src_len, UChar *dst, int32_t dst_len, UErrorCode *err)
 {/*{{{*/
-	const UNormalizer2 *norm;
-
-	/* Mimic the behavior of ICU < 56. */
-	if (UNEXPECTED(NORMALIZER_NONE == form)) {
-		/* FIXME This is a noop which should be removed somewhen after PHP 7.3.*/
-		zend_error(E_DEPRECATED, "Normalizer::NONE is obsolete with ICU 56 and above and will be removed in later PHP versions");
-
-		if (dst_len >= src_len) {
-			memmove(dst, src, sizeof(UChar) * src_len);
-			dst[src_len] = '\0';
-			*err = U_ZERO_ERROR;
-			return src_len;
-		}
-
-		*err = U_BUFFER_OVERFLOW_ERROR;
-		return -1;
-	}
-
-	norm = intl_get_normalizer(form, err);
-	if(U_FAILURE(*err)) {
+	const UNormalizer2 *norm = intl_get_normalizer(form, err);
+	if (U_FAILURE(*err)) {
 		return -1;
 	}
 
@@ -136,8 +118,6 @@ PHP_FUNCTION( normalizer_normalize )
 	expansion_factor = 1;
 
 	switch(form) {
-		case NORMALIZER_NONE:
-			break;
 		case NORMALIZER_FORM_D:
 			expansion_factor = 3;
 			break;
@@ -276,8 +256,6 @@ PHP_FUNCTION( normalizer_is_normalized )
 	}
 
 	switch(form) {
-		/* case NORMALIZER_NONE: not allowed - doesn't make sense */
-
 		case NORMALIZER_FORM_D:
 		case NORMALIZER_FORM_KD:
 		case NORMALIZER_FORM_C:

ext/intl/tests/normalizer_normalize.phpt

@@ -19,23 +19,20 @@ function ut_main()
 		Normalizer::FORM_D,
 		Normalizer::FORM_KC,
 		Normalizer::FORM_KD,
-		Normalizer::NONE,
 	);
 
 	$forms_str = array (
 		Normalizer::FORM_C => 'UNORM_FORM_C',
 		Normalizer::FORM_D => 'UNORM_FORM_D',
 		Normalizer::FORM_KC => 'UNORM_FORM_KC',
 		Normalizer::FORM_KD => 'UNORM_FORM_KD',
-		Normalizer::NONE => 'UNORM_NONE',
 	);
 
 	/* just make sure all the form constants are defined as in the api spec */
 	if ( Normalizer::FORM_C != Normalizer::NFC ||
 		 Normalizer::FORM_D != Normalizer::NFD ||
 		 Normalizer::FORM_KC != Normalizer::NFKC ||
-		 Normalizer::FORM_KD != Normalizer::NFKD ||
-		 Normalizer::NONE == Normalizer::FORM_C ) {
+		 Normalizer::FORM_KD != Normalizer::NFKD) {
 
 			$res_str .= "Invalid normalization form declarations!\n";
 	}
@@ -69,12 +66,7 @@ function ut_main()
 	{
 		foreach( $strs as $str )
 		{
-			if (Normalizer::NONE == $form) {
-				/* Hide deprecation warning. */
-				$str_norm = @ut_norm_normalize( $str, $form );
-			} else {
-				$str_norm = ut_norm_normalize( $str, $form );
-			}
+			$str_norm = ut_norm_normalize( $str, $form );
 			$error_code = intl_get_error_code();
 			$error_message = intl_get_error_message();
 
@@ -150,15 +142,3 @@ ut_run();
 		is in form 'UNORM_FORM_KD'? = no	error info: 'U_ZERO_ERROR' (0)
 '%E1%BA%9B' normalized to form 'UNORM_FORM_KD' is 's%CC%87'	error info: 'U_ZERO_ERROR' (0)
 		is in form 'UNORM_FORM_KD'? = no	error info: 'U_ZERO_ERROR' (0)
-'ABC' normalized to form 'UNORM_NONE' is 'ABC'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-'%C3%A4%7C%7C%C3%A5%7C%7C%C3%B6' normalized to form 'UNORM_NONE' is '%C3%A4%7C%7C%C3%A5%7C%7C%C3%B6'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-'%E2%84%AB%7C%7C%C3%85%7C%7CA%CC%8A' normalized to form 'UNORM_NONE' is '%E2%84%AB%7C%7C%C3%85%7C%7CA%CC%8A'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-'%E2%84%A6%7C%7C%CE%A9' normalized to form 'UNORM_NONE' is '%E2%84%A6%7C%7C%CE%A9'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-'%EF%AC%81' normalized to form 'UNORM_NONE' is '%EF%AC%81'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)
-'%E1%BA%9B' normalized to form 'UNORM_NONE' is '%E1%BA%9B'	error info: 'U_ZERO_ERROR' (0)
-		is in form 'UNORM_NONE'? = no	error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1)

ext/intl/tests/normalizer_normalize_kc_cf.phpt

@@ -58,12 +58,7 @@ function ut_main()
 	{
 		foreach( $strs as $str )
 		{
-			if (Normalizer::NONE == $form) {
-				/* Hide deprecation warning. */
-				$str_norm = @ut_norm_normalize( $str, $form );
-			} else {
-				$str_norm = ut_norm_normalize( $str, $form );
-			}
+			$str_norm = ut_norm_normalize( $str, $form );
 			$error_code = intl_get_error_code();
 			$error_message = intl_get_error_message();