Fix arginfo

Author: kocsismate

ext/intl/dateformat/dateformat.stub.php

@@ -54,7 +54,7 @@ public function getPattern() {}
     /** @return string|false */
     public function getLocale(int $which = UNKNOWN) {}
 
-    /** @return null|bool */
+    /** @return bool|null */
     public function setLenient(bool $lenient) {}
 
     /** @return bool */
@@ -73,7 +73,7 @@ public function format($value) {}
      */
     public static function formatObject($object, $format = null, ?string $locale = null) {}
 
-    /** @return int|false */
+    /** @return int|float|false */
     public function parse(string $value, ?int &$position = null) {}
 
     /** @return array|false */
@@ -103,11 +103,9 @@ function datefmt_set_calendar(IntlDateFormatter $df, $which): bool {}
 
 function datefmt_get_timezone_id(IntlDateFormatter $df): string {}
 
-/** @return IntlCalendar|null|false */
-function datefmt_get_calendar_object(IntlDateFormatter $df) {}
+function datefmt_get_calendar_object(IntlDateFormatter $df): IntlCalendar|false|null {}
 
-/** @return IntlTimeZone|false */
-function datefmt_get_timezone(IntlDateFormatter $df) {}
+function datefmt_get_timezone(IntlDateFormatter $df): IntlTimeZone|false {}
 
 /** @param IntlTimeZone|DateTimeZone|string|null $zone */
 function datefmt_set_timezone(IntlDateFormatter $df, $zone): ?bool {}
@@ -118,7 +116,7 @@ function datefmt_get_pattern(IntlDateFormatter $df): string|false {}
 
 function datefmt_get_locale(IntlDateFormatter $df, int $which = UNKNOWN): string|false {}
 
-function datefmt_set_lenient(IntlDateFormatter $df, bool $lenient): null|bool {}
+function datefmt_set_lenient(IntlDateFormatter $df, bool $lenient): ?bool {}
 
 function datefmt_is_lenient(IntlDateFormatter $df): bool {}
 
@@ -131,7 +129,7 @@ function datefmt_format(IntlDateFormatter $df, $value): string|false {}
  */
 function datefmt_format_object($object, $format = null, ?string $locale = null): string|false {}
 
-function datefmt_parse(IntlDateFormatter $df, string $value, ?int &$position = null): int|false {}
+function datefmt_parse(IntlDateFormatter $df, string $value, ?int &$position = null): int|float|false {}
 
 function datefmt_localtime(IntlDateFormatter $df, string $value, ?int &$position = null): array|false {}
 

ext/intl/dateformat/dateformat_arginfo.h

@@ -95,11 +95,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_get_timezone_id, 0, 1, I
 	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_datefmt_get_calendar_object, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_datefmt_get_calendar_object, 0, 1, IntlCalendar, MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_datefmt_get_timezone arginfo_datefmt_get_calendar_object
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_datefmt_get_timezone, 0, 1, IntlTimeZone, MAY_BE_FALSE)
+	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_timezone, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
@@ -120,7 +122,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_get_locale, 0, 1, MAY_BE
 	ZEND_ARG_TYPE_INFO(0, which, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_set_lenient, 0, 2, MAY_BE_NULL|MAY_BE_BOOL)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_lenient, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -140,7 +142,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_format_object, 0, 1, MAY
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_parse, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_parse, 0, 2, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(1, position, IS_LONG, 1)