use EG to guard

Author: LamentXU123

ext/intl/common/common_date.cpp

@@ -205,9 +205,9 @@ 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
-					&& !EG(exception)) {
-				if (Z_TYPE(casted) == IS_LONG) {
+			if (Z_OBJ_HT_P(z)->cast_object(Z_OBJ_P(z), &casted, _IS_NUMBER) == SUCCESS) {
+				if (EG(exception)) {
+				} else if (Z_TYPE(casted) == IS_LONG) {
 					rv = U_MILLIS_PER_SECOND * (double)Z_LVAL(casted);
 				} else if (Z_TYPE(casted) == IS_DOUBLE) {
 					rv = U_MILLIS_PER_SECOND * Z_DVAL(casted);
@@ -216,7 +216,7 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err)
 						"invalid object type for date/time "
 						"(IntlCalendar, DateTimeInterface, or numeric-castable object permitted)");
 				}
-			} else {
+			} else if (!EG(exception)) { 
 				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
 					"invalid object type for date/time "
 					"(IntlCalendar, DateTimeInterface, or numeric-castable object permitted)");

ext/intl/tests/dateformat_formatObject_numeric_object.phpt

@@ -13,8 +13,12 @@ $fmt = new IntlDateFormatter('en_US', IntlDateFormatter::NONE, IntlDateFormatter
 
 echo $fmt->format(new NumericCastableNoOperations(0)), "\n";
 echo datefmt_format($fmt, new NumericCastableNoOperations(0.5)), "\n";
+var_dump($fmt->format(new stdClass()));
+var_dump(intl_get_error_message());
 
 ?>
 --EXPECT--
 1970-01-01 00:00:00.000
 1970-01-01 00:00:00.500
+bool(false)
+string(146) "IntlDateFormatter::format(): invalid object type for date/time (IntlCalendar, DateTimeInterface, or numeric-castable object permitted): U_ILLEGAL_ARGUMENT_ERROR"

ext/intl/tests/dateformat_format_error.phpt

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