add exception catch, dtor pointers and fix CI

Author: LamentXU123

NEWS

@@ -62,7 +62,7 @@ PHP                                                                        NEWS
   . Fixed bug GH-20426 (Spoofchecker::setRestrictionLevel() error message
     suggests missing constants). (DanielEScherzer)
   . Added grapheme_strrev (Yuya Hamada)
-  . IntlDateFormatter::formatObject() now accepts numeric-castable objects as
+  . IntlDateFormatter::format() now accepts numeric-castable objects as
     date/time values. (Weilin Du)
 
 - JSON:

UPGRADING

@@ -201,9 +201,8 @@ PHP 8.6 UPGRADE NOTES
     message includes the function name and argument index ($modulus).
 
 - Intl:
-  . IntlDateFormatter::formatObject() now accepts objects that support
-    numeric casting as date/time values, in addition to IntlCalendar and
-    DateTimeInterface instances.
+  . IntlDateFormatter::format() now accepts objects that support numeric
+    casting as date/time values.
 
 - mysqli:
   . The return structure of mysqli_get_charset() no longer contains

ext/intl/common/common_date.cpp

@@ -205,7 +205,8 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err)
 			zval casted;
 			ZVAL_UNDEF(&casted);
 
-			if (Z_OBJ_HT_P(z)->cast_object(Z_OBJ_P(z), &casted, _IS_NUMBER) == SUCCESS) {
+			if (Z_OBJ_HT_P(z)->cast_object(Z_OBJ_P(z), &casted, _IS_NUMBER) == SUCCESS
+					&& !EG(exception)) {
 				if (Z_TYPE(casted) == IS_LONG) {
 					rv = U_MILLIS_PER_SECOND * (double)Z_LVAL(casted);
 				} else if (Z_TYPE(casted) == IS_DOUBLE) {
@@ -214,10 +215,12 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err)
 					intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
 						"invalid object type for date/time");
 				}
-				zval_ptr_dtor(&casted);
 			} else {
 				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-					"invalid object type for date/time ");
+					"invalid object type for date/time");
+			}
+			if (!Z_ISUNDEF(casted)) {
+				zval_ptr_dtor(&casted);
 			}
 		}
 		break;

ext/intl/tests/dateformat_formatObject_error.phpt

@@ -40,7 +40,7 @@ var_dump(IntlDateFormatter::formatObject($cal, ""));
 var_dump(intl_get_error_message());
 
 ?>
---EXPECT--
+--EXPECTF--
 DateObjectError: Object of type B (inheriting DateTime) has not been correctly initialized by calling parent::__construct() in its constructor
 bool(false)
 string(130) "IntlDateFormatter::formatObject(): the passed object must be an instance of either IntlCalendar or DateTimeInterface: U_ZERO_ERROR"

ext/intl/tests/dateformat_formatObject_numeric_object.phpt

@@ -1,5 +1,5 @@
 --TEST--
-IntlDateFormatter::formatObject(): numeric-castable objects
+IntlDateFormatter->format(): numeric-castable objects
 --EXTENSIONS--
 intl
 zend_test
@@ -9,10 +9,10 @@ date.timezone=UTC
 --FILE--
 <?php
 
-$format = 'yyyy-MM-dd HH:mm:ss.SSS';
+$fmt = new IntlDateFormatter('en_US', IntlDateFormatter::NONE, IntlDateFormatter::NONE, 'UTC', null, 'yyyy-MM-dd HH:mm:ss.SSS');
 
-echo IntlDateFormatter::formatObject(new NumericCastableNoOperations(0), $format, 'en_US'), "\n";
-echo IntlDateFormatter::formatObject(new NumericCastableNoOperations(0.5), $format, 'en_US'), "\n";
+echo $fmt->format(new NumericCastableNoOperations(0)), "\n";
+echo datefmt_format($fmt, new NumericCastableNoOperations(0.5)), "\n";
 
 ?>
 --EXPECT--

ext/intl/tests/dateformat_format_error.phpt

@@ -19,8 +19,8 @@ var_dump($v);
 var_dump(intl_get_error_message());
 
 ?>
---EXPECT--
+--EXPECTF--
 bool(false)
-string(140) "IntlDateFormatter::format(): invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR"
+string(%d) "IntlDateFormatter::format(): invalid object type for date/time: U_ILLEGAL_ARGUMENT_ERROR"
 bool(false)
-string(129) "datefmt_format(): invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted): U_ILLEGAL_ARGUMENT_ERROR"
+string(%d) "datefmt_format(): invalid object type for date/time: U_ILLEGAL_ARGUMENT_ERROR"