ext/intl: GregorianCalendar using C++ upcasting operator.

devnexen · devnexen · commit 2163ea65de55 · 2025-07-22T22:44:51.000+01:00
when fetching the internal ICU object also removing one useless cast.
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
@@ -71,7 +71,7 @@ U_CFUNC void calendar_object_construct(zval *object,
 
 	CALENDAR_METHOD_FETCH_OBJECT_NO_CHECK; //populate to from object
 	assert(co->ucal == NULL);
-	co->ucal = (Calendar*)calendar;
+	co->ucal = calendar;
 }
 
 /* {{{ clone handler for Calendar */
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -46,7 +46,9 @@ using icu::StringPiece;
 	}
 
 static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
-	return (GregorianCalendar*)co->ucal;
+	GregorianCalendar *gcal = dynamic_cast<GregorianCalendar *>(co->ucal);
+	ZEND_ASSERT(gcal != NULL);
+	return gcal;
 }
 
 static bool set_gregorian_calendar_time_zone(GregorianCalendar *gcal, UErrorCode status)

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ U_CFUNC void calendar_object_construct(zval *object,`
`71`	`71`
`72`	`72`	`CALENDAR_METHOD_FETCH_OBJECT_NO_CHECK; //populate to from object`
`73`	`73`	`assert(co->ucal == NULL);`
`74`		`- co->ucal = (Calendar*)calendar;`
	`74`	`+ co->ucal = calendar;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/* {{{ clone handler for Calendar */`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ using icu::StringPiece;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`static inline GregorianCalendar fetch_greg(Calendar_object co) {`
`49`		`- return (GregorianCalendar*)co->ucal;`
	`49`	`+ GregorianCalendar gcal = dynamic_cast<GregorianCalendar >(co->ucal);`
	`50`	`+ ZEND_ASSERT(gcal != NULL);`
	`51`	`+ return gcal;`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`static bool set_gregorian_calendar_time_zone(GregorianCalendar *gcal, UErrorCode status)`