[pull] master from php:master

ext/intl/listformatter/listformatter_class.cpp

@@ -131,6 +131,8 @@ PHP_METHOD(IntlListFormatter, format)
         Z_PARAM_ARRAY_HT(ht)
     ZEND_PARSE_PARAMETERS_END();
 
+    intl_errors_reset(LISTFORMATTER_ERROR_P(obj));
+
     uint32_t count = zend_hash_num_elements(ht);
     if (count == 0) {
         RETURN_EMPTY_STRING();
@@ -152,7 +154,7 @@ PHP_METHOD(IntlListFormatter, format)
         zend_tmp_string_release(tmp_str);
 
         if (U_FAILURE(conv_status)) {
-            intl_error_set(nullptr, conv_status, "Failed to convert string to UTF-16");
+            intl_errors_set(LISTFORMATTER_ERROR_P(obj), conv_status, "Failed to convert string to UTF-16");
             RETURN_FALSE;
         }
 
@@ -165,14 +167,14 @@ PHP_METHOD(IntlListFormatter, format)
     LISTFORMATTER_OBJECT(obj)->format(items.get(), count, result, status);
 
     if (U_FAILURE(status)) {
-        intl_error_set(nullptr, status, "Failed to format list");
+        intl_errors_set(LISTFORMATTER_ERROR_P(obj), status, "Failed to format list");
         RETURN_FALSE;
     }
 
     zend_string *ret = intl_charFromString(result, &status);
 
     if (!ret) {
-        intl_error_set(nullptr, status, "Failed to convert result to UTF-8");
+        intl_errors_set(LISTFORMATTER_ERROR_P(obj), status, "Failed to convert result to UTF-8");
         RETURN_FALSE;
     }
 

ext/intl/tests/listformatter/listformatter_get_error.phpt

@@ -0,0 +1,25 @@
+--TEST--
+IntlListFormatter getErrorCode()/getErrorMessage() reflect format() failures
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+$formatter = new IntlListFormatter('en_US');
+
+var_dump($formatter->format(["\x80"]));
+var_dump($formatter->getErrorCode() === U_INVALID_CHAR_FOUND);
+var_dump($formatter->getErrorMessage());
+
+var_dump($formatter->format(['a', 'b']));
+var_dump($formatter->getErrorCode() === U_ZERO_ERROR);
+var_dump($formatter->getErrorMessage());
+
+?>
+--EXPECT--
+bool(false)
+bool(true)
+string(85) "IntlListFormatter::format(): Failed to convert string to UTF-16: U_INVALID_CHAR_FOUND"
+string(7) "a and b"
+bool(true)
+string(12) "U_ZERO_ERROR"