Override the error mode and level and remove the duplicate exceptions

Author: BogdanUngureanu

Dockerfile

@@ -0,0 +1,39 @@
+FROM debian:bullseye
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    wget \
+    tar \
+    pkg-config \
+    libtool \
+    automake \
+    autoconf \
+    unzip \
+    bison \
+    re2c \
+    libxml2-dev \
+    libsqlite3-dev \
+    libonig-dev \
+    libzip-dev \
+    g++ \
+    locales \
+    libiconv-hook-dev || true \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get install -y pkg-config build-essential autoconf bison re2c libxml2-dev libsqlite3-dev
+
+WORKDIR /tmp
+RUN wget https://github.com/unicode-org/icu/releases/download/release-62-2/icu4c-62_2-src.tgz && \
+    tar -xzf icu4c-62_2-src.tgz && \
+    cd icu/source && \
+    ./configure --prefix=/usr/local && \
+    make -j$(nproc) && \
+    make install && \
+    ldconfig
+
+WORKDIR /app
+COPY . /app
+RUN ./buildconf --force
+RUN ./configure --enable-debug --enable-intl CFLAGS="-g -O0"
+RUN make -j4

ext/intl/rangeformatter/rangeformatter_class.cpp

@@ -121,9 +121,16 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, createFromSkeleton)
     UnlocalizedNumberFormatter nf = NumberFormatter::forSkeleton(skeleton_ustr, status);
 
     if (U_FAILURE(status)) {
+        // override error level and use exceptions
+        const bool old_use_exception = INTL_G(use_exceptions);
+        const zend_long old_error_level = INTL_G(error_level);
+        INTL_G(use_exceptions) = true;
+        INTL_G(error_level) = 0;
+
         intl_error_set(NULL, status, "Failed to create the number skeleton");
-        zend_throw_exception(IntlException_ce_ptr, "Failed to create the number skeleton", 0);
-        RETURN_THROWS();
+
+        INTL_G(use_exceptions) = old_use_exception;
+        INTL_G(error_level) = old_error_level;
     }
 
     LocalizedNumberRangeFormatter* nrf = new LocalizedNumberRangeFormatter(
@@ -165,20 +172,25 @@ U_CFUNC PHP_METHOD(IntlNumberRangeFormatter, format)
 
     UnicodeString result = RANGEFORMATTER_OBJECT(obj)->formatFormattableRange(start_formattable, end_formattable, error).toString(error);
 
+    // override error level and use exceptions
+    const bool old_use_exception = INTL_G(use_exceptions);
+    const zend_long old_error_level = INTL_G(error_level);
+    INTL_G(use_exceptions) = true;
+    INTL_G(error_level) = 0;
+
     if (U_FAILURE(error)) {
         intl_error_set(NULL, error, "Failed to format number range");
-        zend_throw_exception(IntlException_ce_ptr, "Failed to format number range", 0);
-        RETURN_THROWS();
     }
 
     zend_string *ret = intl_charFromString(result, &error);
 
     if (U_FAILURE(error)) {
         intl_error_set(NULL, error, "Failed to convert result to UTF-8");
-        zend_throw_exception(IntlException_ce_ptr, "Failed to convert result to UTF-8", 0);
-        RETURN_THROWS();
     }
 
+    INTL_G(use_exceptions) = old_use_exception;
+    INTL_G(error_level) = old_error_level;
+
     RETVAL_NEW_STR(ret);
 #endif
 }

ext/intl/tests/rangeformatter/rangeformatter_errors.phpt

@@ -77,7 +77,7 @@ try {
 
 ?>
 --EXPECT--
-Failed to create the number skeleton
+IntlNumberRangeFormatter::createFromSkeleton(): Failed to create the number skeleton
 65811
 IntlNumberRangeFormatter::createFromSkeleton(): Failed to create the number skeleton: U_NUMBER_SKELETON_SYNTAX_ERROR
 Call to private IntlNumberRangeFormatter::__construct() from global scope