Rethink the version checks

As the actual behavior change happens with ICU >= 58, the new
functionality should stay same in the lower versions. This comply also
with lower PHP versions so far.

diff --git a/ext/intl/spoofchecker/spoofchecker.c b/ext/intl/spoofchecker/spoofchecker.c
index 2db28612d4e829bd089044fa88250fe94510203c..221b69ee5bcd7aa9c167d15864fb845966f886d0 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker.c
+++ b/ext/intl/spoofchecker/spoofchecker.c
@@ -45,14 +45,12 @@ void spoofchecker_register_constants(INIT_FUNC_ARGS)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(INVISIBLE)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(CHAR_LIMIT)
 
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
        SPOOFCHECKER_EXPOSE_CLASS_CONST(ASCII)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(HIGHLY_RESTRICTIVE)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(MODERATELY_RESTRICTIVE)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(MINIMALLY_RESTRICTIVE)
        SPOOFCHECKER_EXPOSE_CLASS_CONST(UNRESTRICTIVE)
-#endif
-#if U_ICU_VERSION_MAJOR_NUM >= 53
        SPOOFCHECKER_EXPOSE_CLASS_CONST(SINGLE_SCRIPT_RESTRICTIVE)
 #endif
 

diff --git a/ext/intl/spoofchecker/spoofchecker_class.c b/ext/intl/spoofchecker/spoofchecker_class.c
index 36545beb49d2b5f4efc4f4e193c985179b874ed5..ab41a00490762327e399438c13312c919d8a70a0 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_class.c
+++ b/ext/intl/spoofchecker/spoofchecker_class.c
@@ -84,7 +84,7 @@ ZEND_BEGIN_ARG_INFO_EX(spoofchecker_are_confusable, 0, 0, 2)
        ZEND_ARG_INFO(1, error)
 ZEND_END_ARG_INFO()
 
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
 ZEND_BEGIN_ARG_INFO_EX(spoofchecker_set_restriction_level, 0, 0, 1)
        ZEND_ARG_INFO(0, level)
 ZEND_END_ARG_INFO()
@@ -102,7 +102,7 @@ zend_function_entry Spoofchecker_class_functions[] = {
        PHP_ME(Spoofchecker, areConfusable, spoofchecker_are_confusable, ZEND_ACC_PUBLIC)
        PHP_ME(Spoofchecker, setAllowedLocales, spoofchecker_set_allowed_locales, ZEND_ACC_PUBLIC)
        PHP_ME(Spoofchecker, setChecks, spoofchecker_set_checks, ZEND_ACC_PUBLIC)
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
        PHP_ME(Spoofchecker, setRestrictionLevel, spoofchecker_set_restriction_level, ZEND_ACC_PUBLIC)
 #endif
        PHP_FE_END

diff --git a/ext/intl/spoofchecker/spoofchecker_class.h b/ext/intl/spoofchecker/spoofchecker_class.h
index 108bc4a11dde07013ecc20668e338064487d3e58..c0cb0c5327cd60ebed29e68dfa2cf57793cb0b89 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_class.h
+++ b/ext/intl/spoofchecker/spoofchecker_class.h
@@ -78,7 +78,7 @@ extern zend_class_entry *Spoofchecker_ce_ptr;
         RETURN_FALSE;                                                           \
     }                                                                           \
 
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
 #define SPOOFCHECKER_DEFAULT_RESTRICTION_LEVEL USPOOF_HIGHLY_RESTRICTIVE
 #endif
 

diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c
index eb969155c931e2a3616bae70a38675a6ecc7511f..8108cafa2feb35e13544c9609879969859e5538e 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_create.c
+++ b/ext/intl/spoofchecker/spoofchecker_create.c
@@ -43,7 +43,7 @@ PHP_METHOD(Spoofchecker, __construct)
        co->uspoof = uspoof_open(SPOOFCHECKER_ERROR_CODE_P(co));
        INTL_METHOD_CHECK_STATUS(co, "spoofchecker: unable to open ICU Spoof Checker");
 
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
        /* TODO save it into the object for further suspiction check comparison. */
        /* ICU 58 removes WSC and MSC handling. However there are restriction
         levels as defined in

diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c
index d981c9fe10594b88600081de1829bdec1170b01c..d41a9ae9ccf1b778eeb5c22bf2fd6fe549091977 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_main.c
+++ b/ext/intl/spoofchecker/spoofchecker_main.c
@@ -134,7 +134,7 @@ PHP_METHOD(Spoofchecker, setChecks)
 }
 /* }}} */
 
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
 /* {{{ proto void Spoofchecker::setRestrictionLevel( int $restriction_level )
  * Set the loosest restriction level allowed for strings.
  */
@@ -150,9 +150,7 @@ PHP_METHOD(Spoofchecker, setRestrictionLevel)
        SPOOFCHECKER_METHOD_FETCH_OBJECT;
 
        if (USPOOF_ASCII != level &&
-#if U_ICU_VERSION_MAJOR_NUM >= 53
                        USPOOF_SINGLE_SCRIPT_RESTRICTIVE != level &&
-#endif
                        USPOOF_HIGHLY_RESTRICTIVE != level &&
                        USPOOF_MODERATELY_RESTRICTIVE != level &&
                        USPOOF_MINIMALLY_RESTRICTIVE != level &&

diff --git a/ext/intl/spoofchecker/spoofchecker_main.h b/ext/intl/spoofchecker/spoofchecker_main.h
index c9deab4445179ec2e50c95eae537dee837d33ec8..227f0e8481f7e7850064a5125cdd7dd8975f70cc 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_main.h
+++ b/ext/intl/spoofchecker/spoofchecker_main.h
@@ -23,7 +23,7 @@ PHP_METHOD(Spoofchecker, isSuspicious);
 PHP_METHOD(Spoofchecker, areConfusable);
 PHP_METHOD(Spoofchecker, setAllowedLocales);
 PHP_METHOD(Spoofchecker, setChecks);
-#if U_ICU_VERSION_MAJOR_NUM >= 51
+#if U_ICU_VERSION_MAJOR_NUM >= 58
 PHP_METHOD(Spoofchecker, setRestrictionLevel);
 #endif