Merge remote-tracking branch 'derickr/bug80047-take2' into PHP-8.0

Author: derickr

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2022, PHP 8.0.23
 
+- Date:
+  . Fixed bug #80047 (DatePeriod doesn't warn with custom DateTimeImmutable).
+    (Derick)
+
 - DBA:
   . Fixed LMDB driver memory leak on DB creation failure (Girgias)
   . Fixed bug GH-9155 (dba_open("non-existing", "c-", "flatfile") segfaults).

ext/date/php_date.c

@@ -1475,6 +1475,17 @@ static int date_period_it_has_more(zend_object_iterator *iter)
 }
 /* }}} */
 
+static zend_class_entry *get_base_date_class(zend_class_entry *start_ce)
+{
+	zend_class_entry *tmp = start_ce;
+
+	while (tmp != date_ce_date && tmp != date_ce_immutable && tmp->parent) {
+		tmp = tmp->parent;
+	}
+
+	return tmp;
+}
+
 /* {{{ date_period_it_current_data */
 static zval *date_period_it_current_data(zend_object_iterator *iter)
 {
@@ -1484,7 +1495,7 @@ static zval *date_period_it_current_data(zend_object_iterator *iter)
 	php_date_obj   *newdateobj;
 
 	/* Create new object */
-	php_date_instantiate(object->start_ce, &iterator->current);
+	php_date_instantiate(get_base_date_class(object->start_ce), &iterator->current);
 	newdateobj = Z_PHPDATE_P(&iterator->current);
 	newdateobj->time = timelib_time_ctor();
 	*newdateobj->time = *it_time;
@@ -4227,20 +4238,6 @@ PHP_METHOD(DatePeriod, __construct)
 		}
 		dpobj->start_ce = date_ce_date;
 	} else {
-		/* Sanity checks */
-		if (start && Z_OBJCE_P(start) != date_ce_date && Z_OBJCE_P(start) != date_ce_immutable) {
-			zend_string *func = get_active_function_or_method_name();
-			zend_throw_error(zend_ce_exception, "%s(): Class of start date must be exactly DateTime or DateTimeImmutable, object of class %s provided", ZSTR_VAL(func), ZSTR_VAL(Z_OBJCE_P(start)->name));
-			zend_string_release(func);
-			RETURN_THROWS();
-		}
-		if (end && Z_OBJCE_P(end) != date_ce_date && Z_OBJCE_P(end) != date_ce_immutable) {
-			zend_string *func = get_active_function_or_method_name();
-			zend_throw_error(zend_ce_exception, "%s(): Class of end date must be exactly DateTime or DateTimeImmutable, object of class %s provided", ZSTR_VAL(func), ZSTR_VAL(Z_OBJCE_P(end)->name));
-			zend_string_release(func);
-			RETURN_THROWS();
-		}
-
 		/* init */
 		php_interval_obj *intobj = Z_PHPINTERVAL_P(interval);
 

ext/date/tests/bug80042.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Bug #80047: DatePeriod doesn't support custom DateTimeImmutable
+--INI--
+date.timezone=UTC
+--FILE--
+<?php
+class CustomDateTime extends DateTime {}
+class CustomDateTimeImmutable extends DateTimeImmutable {}
+
+$dt = new DateTime('2022-06-24');
+$dti = new DateTimeImmutable('2022-06-24');
+$cdt = new CustomDateTime('2022-06-25');
+$cdti = new CustomDateTimeImmutable('2022-06-25');
+$i = new DateInterval('P1D');
+
+$tests = [
+	[ $dt,   $i, $cdt  ],
+	[ $cdt,  $i, $dt   ],
+	[ $cdt,  $i, $cdt  ],
+	[ $dti,  $i, $cdti ],
+	[ $cdti, $i, $dti  ],
+	[ $cdti, $i, $cdti ],
+	[ $cdt,  $i, $cdti ],
+];
+
+foreach ($tests as $test) {
+	$dp = new DatePeriod(...$test);
+	foreach ($dp as $date) {}
+	echo get_class($date), "\n";
+}
+?>
+--EXPECT--
+DateTime
+DateTime
+DateTime
+DateTimeImmutable
+DateTimeImmutable
+DateTimeImmutable
+DateTimeImmutable