Fix conflicts

Author: kocsismate

ext/date/php_date.c

@@ -1450,6 +1450,7 @@ static void initialize_date_period_properties(php_period_obj *period_obj)
 
 	zend_update_property_long(date_ce_period, &period_obj->std, "recurrences", sizeof("recurrences") - 1, (zend_long) period_obj->recurrences);
 	zend_update_property_bool(date_ce_period, &period_obj->std, "include_start_date", sizeof("include_start_date") - 1, period_obj->include_start_date);
+	zend_update_property_bool(date_ce_period, &period_obj->std, "include_end_date", sizeof("include_end_date") - 1, period_obj->include_end_date);
 }
 
 /* define an overloaded iterator structure */

ext/date/php_date.stub.php

@@ -683,14 +683,6 @@ public static function __set_state(array $array): DateInterval {}
 
 class DatePeriod implements IteratorAggregate
 {
-    public readonly ?DateTimeInterface $start;
-    /** @readonly */
-    public ?DateTimeInterface $current;
-    public readonly ?DateTimeInterface $end;
-    public readonly ?DateInterval $interval;
-    public readonly int $recurrences;
-    public readonly bool $include_start_date;
-
     /**
      * @var int
      * @cname PHP_DATE_PERIOD_EXCLUDE_START_DATE
@@ -702,6 +694,15 @@ class DatePeriod implements IteratorAggregate
      */
     public const INCLUDE_END_DATE = UNKNOWN;
 
+    public readonly ?DateTimeInterface $start;
+    /** @readonly */
+    public ?DateTimeInterface $current;
+    public readonly ?DateTimeInterface $end;
+    public readonly ?DateInterval $interval;
+    public readonly int $recurrences;
+    public readonly bool $include_start_date;
+    public readonly bool $include_end_date;
+
     /**
      * @param DateTimeInterface|string $start
      * @param DateInterval|int $interval

ext/date/php_date_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: dc54d1976c4fb2c5d1b7ee0bfe566abc8847c554 */
+ * Stub hash: 7ef8c504e35ca49f2c7442bd572b196587a36b7b */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -1066,5 +1066,11 @@ static zend_class_entry *register_class_DatePeriod(zend_class_entry *class_entry
 	zend_declare_typed_property(class_entry, property_include_start_date_name, &property_include_start_date_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
 	zend_string_release(property_include_start_date_name);
 
+	zval property_include_end_date_default_value;
+	ZVAL_UNDEF(&property_include_end_date_default_value);
+	zend_string *property_include_end_date_name = zend_string_init("include_end_date", sizeof("include_end_date") - 1, 1);
+	zend_declare_typed_property(class_entry, property_include_end_date_name, &property_include_end_date_default_value, ZEND_ACC_PUBLIC|ZEND_ACC_READONLY, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
+	zend_string_release(property_include_end_date_name);
+
 	return class_entry;
 }