ext/intl: Fix compile issues with ICU versions lower than 67 (php#18868)

Author: BogdanUngureanu

ext/intl/listformatter/listformatter.stub.php

@@ -8,8 +8,13 @@
  */
 final class IntlListFormatter {
 
+#if U_ICU_VERSION_MAJOR_NUM >= 67
      /** @cvalue ULISTFMT_TYPE_AND */
      public const int TYPE_AND = UNKNOWN;
+#else
+    /** @cvalue INTL_LISTFORMATTER_FALLBACK_TYPE_AND */
+    public const int TYPE_AND = UNKNOWN;
+#endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_TYPE_OR */
@@ -19,8 +24,13 @@ final class IntlListFormatter {
     public const int TYPE_UNITS = UNKNOWN;
 #endif
 
+#if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_WIDTH_WIDE */
     public const int WIDTH_WIDE = UNKNOWN;
+#else
+    /** @cvalue INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE */
+    public const int WIDTH_WIDE = UNKNOWN;
+#endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_WIDTH_SHORT */

ext/intl/listformatter/listformatter_arginfo.h

@@ -15,8 +15,8 @@
 #include "php.h"
 #include "php_intl.h"
 #include <unicode/ulistformatter.h>
-#include "listformatter_arginfo.h"
 #include "listformatter_class.h"
+#include "listformatter_arginfo.h"
 #include "intl_convert.h"
 
 static zend_object_handlers listformatter_handlers;
@@ -53,8 +53,13 @@ PHP_METHOD(IntlListFormatter, __construct)
     ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS);
     char* locale;
     size_t locale_len = 0;
-    zend_long type = ULISTFMT_TYPE_AND;
-    zend_long width = ULISTFMT_WIDTH_WIDE;
+    #if U_ICU_VERSION_MAJOR_NUM >= 67
+        zend_long type = ULISTFMT_TYPE_AND;
+        zend_long width = ULISTFMT_WIDTH_WIDE;
+    #else
+        zend_long type = INTL_LISTFORMATTER_FALLBACK_TYPE_AND;
+        zend_long width = INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE;
+    #endif
     ZEND_PARSE_PARAMETERS_START(1, 3)
         Z_PARAM_STRING(locale, locale_len)
         Z_PARAM_OPTIONAL
@@ -90,12 +95,12 @@ PHP_METHOD(IntlListFormatter, __construct)
 
         LISTFORMATTER_OBJECT(obj) = ulistfmt_openForType(locale, type, width, &status);
     #else
-        if (type != ULISTFMT_TYPE_AND) {
+        if (type != INTL_LISTFORMATTER_FALLBACK_TYPE_AND) {
             zend_argument_value_error(2, "contains an unsupported type. ICU 66 and below only support IntlListFormatter::TYPE_AND");
             RETURN_THROWS();
         }
 
-        if (width != ULISTFMT_WIDTH_WIDE) {
+        if (width != INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE) {
             zend_argument_value_error(3, "contains an unsupported width. ICU 66 and below only support IntlListFormatter::WIDTH_WIDE");
             RETURN_THROWS();
         }

ext/intl/listformatter/listformatter_class.c

@@ -49,4 +49,7 @@ static inline ListFormatter_object *php_intl_listformatter_fetch_object(zend_obj
 void listformatter_register_class( void );
 extern zend_class_entry *ListFormatter_ce_ptr;
 
+#define INTL_LISTFORMATTER_FALLBACK_TYPE_AND 0
+#define INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE 0
+
 #endif // LISTFORMATTER_CLASS_H