ext/intl: Allow numeric-castable objects as date/time values in IntlDateFormatter::formatObject()

Author: LamentXU123

NEWS

@@ -62,6 +62,8 @@ 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
+    date/time values. (Weilin Du)
 
 - JSON:
   . Enriched JSON last error / exception message with error location.

UPGRADING

@@ -200,6 +200,11 @@ PHP 8.6 UPGRADE NOTES
   . gmp_powm() modulo-by-zero now raises a DivisionByZeroError whose
     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.
+
 - mysqli:
   . The return structure of mysqli_get_charset() no longer contains
     the undocumented "comment" element. The value of "charsetnr" is

ext/intl/common/common_date.cpp

@@ -202,10 +202,23 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err)
 				}
 			}
 		} else {
-			/* TODO: try with cast(), get() to obtain a number */
-			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR,
-				"invalid object type for date/time "
-				"(only IntlCalendar and DateTimeInterface permitted)");
+			zval casted;
+			ZVAL_UNDEF(&casted);
+
+			if (Z_OBJ_HT_P(z)->cast_object(Z_OBJ_P(z), &casted, _IS_NUMBER) == SUCCESS) {
+				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);
+				} else {
+					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 ");
+			}
 		}
 		break;
 	case IS_REFERENCE:

ext/intl/tests/dateformat_formatObject_numeric_object.phpt

@@ -0,0 +1,20 @@
+--TEST--
+IntlDateFormatter::formatObject(): numeric-castable objects
+--EXTENSIONS--
+intl
+zend_test
+--INI--
+intl.default_locale=en_US
+date.timezone=UTC
+--FILE--
+<?php
+
+$format = '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";
+
+?>
+--EXPECT--
+1970-01-01 00:00:00.000
+1970-01-01 00:00:00.500