Merge branch 'PHP-8.0'

* PHP-8.0:
  Sync datefmt_get_calendar_object signature
  Sync intlcal_create_instance() and IntlCalendar::createInstance()
  Sync date_diff and DateTime::diff return type

6 files changed, 7 insertions, 7 deletions

diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index fef4ffb02f..cb01b7e073 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -238,7 +238,7 @@ class DateTime implements DateTimeInterface
     public function getTimestamp() {}
 
     /**
-     * @return DateInterval|false
+     * @return DateInterval
      * @alias date_diff
      */
     public function diff(DateTimeInterface $targetObject, bool $absolute = false) {}
@@ -291,7 +291,7 @@ class DateTimeImmutable implements DateTimeInterface
     public function getTimestamp() {}
 
     /**
-     * @return DateInterval|false
+     * @return DateInterval
      * @alias date_diff
      */
     public function diff(DateTimeInterface $targetObject, bool $absolute = false) {}
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 7be0de2e02..cf50abb43f 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 339c2c91f38eeaafac6134ac04573243069502f5 */
+ * Stub hash: 880a93d8a3461635447318317869fa7d3d7762dd */
 
 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)
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index ded7dfe45d..3da6ebb1d0 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -8,7 +8,7 @@ class IntlCalendar
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
-     * @return IntlCalendar|IntlGregorianCalendar|null
+     * @return IntlCalendar|null
      * @alias intlcal_create_instance
      */
     public static function createInstance($timezone = null, ?string $locale = null) {}
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 29e0d4f908..8537836d5b 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ee755d4a500e2d1ba4d589c233b7d09a06b5cce8 */
+ * Stub hash: 18a92d3af801f11e5c3b90e5d272fd98b3515c40 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php
index 032a04c6fa..22ece903c1 100644
--- a/ext/intl/dateformat/dateformat.stub.php
+++ b/ext/intl/dateformat/dateformat.stub.php
@@ -48,7 +48,7 @@ class IntlDateFormatter
     public function getTimeZoneId() {}
 
     /**
-     * @return IntlCalendar|null|false
+     * @return IntlCalendar|false|null
      * @alias datefmt_get_calendar_object
      */
     public function getCalendarObject() {}
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index d406fce6ed..ff9fbfa6fd 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 437726f2d61a93d530e7e3b6df0741ae68c64697 */
+ * Stub hash: 62742b5f463272f43970e98900a89d513c4fb839 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)