Add error methods, update error messages and tests

Author: BogdanUngureanu

ext/intl/rangeformatter/rangeformatter.stub.php

@@ -7,7 +7,7 @@
  * @strict-properties
  */
 final class IntlNumberRangeFormatter {
-
+#if U_ICU_VERSION_MAJOR_NUM >= 63
     /** @cvalue UNUM_RANGE_COLLAPSE_AUTO */
     public const int COLLAPSE_AUTO = UNKNOWN;
 
@@ -31,10 +31,31 @@ final class IntlNumberRangeFormatter {
 
     /** @cvalue UNUM_IDENTITY_FALLBACK_RANGE */
     public const int IDENTITY_FALLBACK_RANGE = UNKNOWN;
+#else
+    public const int COLLAPSE_AUTO = 0;
+
+    public const int COLLAPSE_NONE = 1;
+
+    public const int COLLAPSE_UNIT = 2;
+
+    public const int COLLAPSE_ALL = 3;
+    
+    public const int IDENTITY_FALLBACK_SINGLE_VALUE = 0;
+
+    public const int IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE = 1;
+
+    public const int IDENTITY_FALLBACK_APPROXIMATELY = 2;
+
+    public const int IDENTITY_FALLBACK_RANGE = 3;
+#endif
 
     private function __construct() {}
 
     public static function createFromSkeleton(string $skeleton, string $locale, int $collapse, int $identityFallback): IntlNumberRangeFormatter {}
 
     public function format(float|int $start, float|int $end): string {}
+
+    public function getErrorCode(): int {}
+
+    public function getErrorMessage(): string {}
 }

ext/intl/rangeformatter/rangeformatter_arginfo.h

@@ -20,6 +20,9 @@
 
 extern "C" {
     #include "php.h"
+    #include "zend_API.h"
+    #include "../intl_common.h"
+    #include "../intl_error.h"
     #include "../php_intl.h"
     #include "../intl_data.h"
     #include "rangeformatter_arginfo.h"
@@ -45,16 +48,28 @@ zend_object *IntlNumberRangeFormatter_object_create(zend_class_entry *ce)
 	zend_object_std_init(&intern->zo, ce);
 	object_properties_init(&intern->zo, ce);
 
+	// Initialize rangeformatter_data structure
+	intl_error_init(&intern->nrf_data.error);
+	intern->nrf_data.unumrf = nullptr;
+
+    intern->zo.handlers = &rangeformatter_handlers;
+
 	return &intern->zo;
 }
 
 U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, __construct)
 {
-   
+    ZEND_PARSE_PARAMETERS_NONE();
+    zend_throw_error(NULL, "Cannot directly construct %s, use createFromSkeleton method instead", ZSTR_VAL(Z_OBJCE_P(ZEND_THIS)->name));
 }
 
 U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
 {
+    #if U_ICU_VERSION_MAJOR_NUM < 63
+        zend_throw_error(NULL, "IntlNumberRangeFormatter is not available in ICU 62 and earlier");
+        RETURN_THROWS();
+    #endif
+
     char* skeleton;
     char* locale;
     size_t locale_len;
@@ -74,12 +89,12 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
     }
 
     if (skeleton_len == 0) {
-        zend_argument_value_error(1, "Skeleton string cannot be empty");
+        zend_argument_must_not_be_empty_error(1);
         RETURN_THROWS();
     }
 
     if (locale_len > INTL_MAX_LOCALE_LEN) {
-        zend_argument_value_error(2, "Locale string too long, should be no longer than %d characters", INTL_MAX_LOCALE_LEN);
+        zend_argument_value_error(2, "must be no longer than %d characters", INTL_MAX_LOCALE_LEN);
         RETURN_THROWS();
     }
 
@@ -89,20 +104,26 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
     }
 
     if (collapse != UNUM_RANGE_COLLAPSE_AUTO && collapse != UNUM_RANGE_COLLAPSE_NONE && collapse != UNUM_RANGE_COLLAPSE_UNIT && collapse != UNUM_RANGE_COLLAPSE_ALL) {
-        zend_argument_value_error(3, "Invalid collapse value");
+        zend_argument_value_error(3, "must be one of IntlNumberRangeFormatter::COLLAPSE_AUTO, IntlNumberRangeFormatter::COLLAPSE_NONE, IntlNumberRangeFormatter::COLLAPSE_UNIT, or IntlNumberRangeFormatter::COLLAPSE_ALL");
         RETURN_THROWS();
     }
 
     if (identityFallback != UNUM_IDENTITY_FALLBACK_SINGLE_VALUE && identityFallback != UNUM_IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE && identityFallback != UNUM_IDENTITY_FALLBACK_APPROXIMATELY && identityFallback != UNUM_IDENTITY_FALLBACK_RANGE) {
-        zend_argument_value_error(4, "Invalid identity fallback value");
+        zend_argument_value_error(4, "must be one of IntlNumberRangeFormatter::IDENTITY_FALLBACK_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, IntlNumberRangeFormatter::IDENTITY_FALLBACK_APPROXIMATELY, or IntlNumberRangeFormatter::IDENTITY_FALLBACK_RANGE");
         RETURN_THROWS();
     }
 
-    UErrorCode error = U_ZERO_ERROR;
+    UErrorCode status = U_ZERO_ERROR;
 
     UnicodeString skeleton_ustr(skeleton, skeleton_len);
 
-    UnlocalizedNumberFormatter nf = NumberFormatter::forSkeleton(skeleton_ustr, error);
+    UnlocalizedNumberFormatter nf = NumberFormatter::forSkeleton(skeleton_ustr, status);
+
+    if (U_FAILURE(status)) {
+        intl_error_set(NULL, status, "Failed to create the number skeleton", 0);
+        zend_throw_exception(IntlException_ce_ptr, "Failed to create the number skeleton", 0);
+        RETURN_THROWS();
+    }
 
     LocalizedNumberRangeFormatter* nrf = new LocalizedNumberRangeFormatter(
         NumberRangeFormatter::with()
@@ -113,7 +134,6 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
     );
 
     zend_object* obj = IntlNumberRangeFormatter_object_create(class_entry_IntlNumberRangeFormatter);
-    obj->handlers = &rangeformatter_handlers;
 
     RANGEFORMATTER_OBJECT(php_intl_numberrangeformatter_fetch_object(obj)) = nrf;
 
@@ -123,37 +143,58 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
 
 U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, format)
 {
-    double start;
-    double end;
+    zval *start;
+    zval *end;
 
     IntlNumberRangeFormatter_object* obj = Z_INTL_RANGEFORMATTER_P(ZEND_THIS);
 
     ZEND_PARSE_PARAMETERS_START(2, 2)
-        Z_PARAM_DOUBLE(start)
-        Z_PARAM_DOUBLE(end)
+        Z_PARAM_NUMBER(start)
+        Z_PARAM_NUMBER(end)
     ZEND_PARSE_PARAMETERS_END();
 
     UErrorCode error = U_ZERO_ERROR;
 
-    UnicodeString result = RANGEFORMATTER_OBJECT(obj)->formatFormattableRange(start, end, error).toString(error);
+    icu::Formattable start_formattable(Z_TYPE_P(start) == IS_DOUBLE ? Z_DVAL_P(start) : Z_LVAL_P(start));
+    icu::Formattable end_formattable(Z_TYPE_P(end) == IS_DOUBLE ? Z_DVAL_P(end) : Z_LVAL_P(end));
+
+    UnicodeString result = RANGEFORMATTER_OBJECT(obj)->formatFormattableRange(start_formattable, end_formattable, error).toString(error);
 
     if (U_FAILURE(error)) {
         intl_error_set(NULL, error, "Failed to format number range", 0);
-
-        return;
+        zend_throw_exception(IntlException_ce_ptr, "Failed to format number range", 0);
+        RETURN_THROWS();
     }
 
    zend_string *ret = intl_charFromString(result, &error);
 
-   if (!ret) {
+   if (U_FAILURE(error)) {
         intl_error_set(NULL, error, "Failed to convert result to UTF-8", 0);
-        // RETVAL_FALSE;
-        return;
+        zend_throw_exception(IntlException_ce_ptr, "Failed to convert result to UTF-8", 0);
+        RETURN_THROWS();
    }
 
    RETVAL_NEW_STR(ret);
 }
 
+U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, getErrorCode)
+{
+    ZEND_PARSE_PARAMETERS_NONE();
+
+    IntlNumberRangeFormatter_object* obj = Z_INTL_RANGEFORMATTER_P(ZEND_THIS);
+
+    RETURN_LONG(intl_error_get_code(&obj->nrf_data.error));
+}
+
+U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, getErrorMessage)
+{
+    ZEND_PARSE_PARAMETERS_NONE();
+
+    IntlNumberRangeFormatter_object* obj = Z_INTL_RANGEFORMATTER_P(ZEND_THIS);
+
+    RETURN_STR(intl_error_get_message(&obj->nrf_data.error));
+}
+
 void IntlNumberRangeFormatter_object_free(zend_object *object)
 {
 	IntlNumberRangeFormatter_object* nfo = php_intl_numberrangeformatter_fetch_object(object);