Merge pull request #8739 from niconoe-/fix-8735

Fix #8735: IntlDateFormatter CallMaps.
vimeo · Nov 23, 2022 · 8f39de9 · 8f39de9
2 parents feb7cd6 + 98c60f4
commit 8f39de9
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 27 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -6343,28 +6343,27 @@
 'IntlCodePointBreakIterator::preceding' => ['int', 'offset'=>'string'],
 'IntlCodePointBreakIterator::previous' => ['int'],
 'IntlCodePointBreakIterator::setText' => ['bool', 'text'=>'string'],
-'IntlDateFormatter::__construct' => ['void', 'locale'=>'?string', 'datetype'=>'?int', 'timetype'=>'?int', 'timezone='=>'null|string|IntlTimeZone|DateTimeZone', 'calendar='=>'null|int|IntlCalendar', 'pattern='=>'string'],
-'IntlDateFormatter::create' => ['IntlDateFormatter|false', 'locale'=>'?string', 'datetype'=>'?int', 'timetype'=>'?int', 'timezone='=>'null|string|IntlTimeZone|DateTimeZone', 'calendar='=>'int|IntlCalendar', 'pattern='=>'string'],
-'IntlDateFormatter::format' => ['string|false', 'args'=>''],
-'IntlDateFormatter::formatObject' => ['string|false', 'object'=>'object', 'format='=>'mixed', 'locale='=>'string'],
-'IntlDateFormatter::getCalendar' => ['int'],
-'IntlDateFormatter::getCalendarObject' => ['IntlCalendar'],
-'IntlDateFormatter::getDateType' => ['int'],
+'IntlDateFormatter::__construct' => ['void', 'locale'=>'?string', 'dateType='=>'int', 'timeType='=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+'IntlDateFormatter::create' => ['?IntlDateFormatter', 'locale'=>'?string', 'dateType='=>'int', 'timeType='=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+'IntlDateFormatter::format' => ['string|false', 'datetime'=>'IntlCalendar|DateTimeInterface|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+'IntlDateFormatter::formatObject' => ['string|false', 'datetime'=>'IntlCalendar|DateTimeInterface', 'format='=>'array{0: int, 1: int}|int|string|null', 'locale='=>'?string'],
+'IntlDateFormatter::getCalendar' => ['int|false'],
+'IntlDateFormatter::getCalendarObject' => ['IntlCalendar|false|null'],
+'IntlDateFormatter::getDateType' => ['int|false'],
 'IntlDateFormatter::getErrorCode' => ['int'],
 'IntlDateFormatter::getErrorMessage' => ['string'],
-'IntlDateFormatter::getLocale' => ['string|false'],
-'IntlDateFormatter::getPattern' => ['string'],
-'IntlDateFormatter::getTimeType' => ['int'],
+'IntlDateFormatter::getLocale' => ['string|false', 'type='=>'int'],
+'IntlDateFormatter::getPattern' => ['string|false'],
+'IntlDateFormatter::getTimeType' => ['int|false'],
 'IntlDateFormatter::getTimeZone' => ['IntlTimeZone|false'],
-'IntlDateFormatter::getTimeZoneId' => ['string'],
+'IntlDateFormatter::getTimeZoneId' => ['string|false'],
 'IntlDateFormatter::isLenient' => ['bool'],
-'IntlDateFormatter::localtime' => ['array', 'text_to_parse'=>'string', '&w_parse_pos='=>'int'],
-'IntlDateFormatter::parse' => ['int|false', 'text_to_parse'=>'string', '&rw_parse_pos='=>'int'],
-'IntlDateFormatter::setCalendar' => ['bool', 'calendar'=>''],
-'IntlDateFormatter::setLenient' => ['bool', 'lenient'=>'bool'],
+'IntlDateFormatter::localtime' => ['array|false', 'string'=>'string', '&rw_offset='=>'int'],
+'IntlDateFormatter::parse' => ['int|float|false', 'string'=>'string', '&rw_offset='=>'int'],
+'IntlDateFormatter::setCalendar' => ['bool', 'calendar'=>'IntlCalendar|int|null'],
+'IntlDateFormatter::setLenient' => ['void', 'lenient'=>'bool'],
 'IntlDateFormatter::setPattern' => ['bool', 'pattern'=>'string'],
-'IntlDateFormatter::setTimeZone' => ['bool', 'timezone'=>''],
-'IntlDateFormatter::setTimeZoneId' => ['bool', 'zone'=>'string', 'fmt='=>'IntlDateFormatter'],
+'IntlDateFormatter::setTimeZone' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
 'IntlException::__clone' => ['void'],
 'IntlException::__construct' => ['void'],
 'IntlException::__toString' => ['string'],

diff --git a/dictionaries/CallMap_71_delta.php b/dictionaries/CallMap_71_delta.php
@@ -38,6 +38,10 @@
       'old' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string'],
       'new' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
     ],
+    'IntlDateFormatter::format' => [
+        'old' => ['string|false', 'value'=>'IntlCalendar|DateTime|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+        'new' => ['string|false', 'value'=>'IntlCalendar|DateTimeInterface|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+    ],
     'SQLite3::createFunction' => [
       'old' => ['bool', 'name'=>'string', 'callback'=>'callable', 'argCount='=>'int'],
       'new' => ['bool', 'name'=>'string', 'callback'=>'callable', 'argCount='=>'int', 'flags='=>'int'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -57,6 +57,70 @@
       'old' => ['list<string>|false', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
       'new' => ['list<string>', 'timezoneGroup='=>'int', 'countryCode='=>'string|null'],
     ],
+    'IntlDateFormatter::__construct' => [
+        'old' => ['void', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+        'new' => ['void', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    ],
+    'IntlDateFormatter::create' => [
+        'old' => ['?IntlDateFormatter', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+        'new' => ['?IntlDateFormatter', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    ],
+    'IntlDateFormatter::format' => [
+        'old' => ['string|false', 'value'=>'IntlCalendar|DateTimeInterface|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+        'new' => ['string|false', 'datetime'=>'IntlCalendar|DateTimeInterface|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+    ],
+    'IntlDateFormatter::formatObject' => [
+        'old' => ['string|false', 'object'=>'IntlCalendar|DateTime', 'format='=>'array{0: int, 1: int}|int|string|null', 'locale='=>'?string'],
+        'new' => ['string|false', 'datetime'=>'IntlCalendar|DateTimeInterface', 'format='=>'array{0: int, 1: int}|int|string|null', 'locale='=>'?string'],
+    ],
+    'IntlDateFormatter::getCalendar' => [
+        'old' => ['int'],
+        'new' => ['int|false'],
+    ],
+    'IntlDateFormatter::getCalendarObject' => [
+        'old' => ['IntlCalendar'],
+        'new' => ['IntlCalendar|false|null'],
+    ],
+    'IntlDateFormatter::getDateType' => [
+        'old' => ['int'],
+        'new' => ['int|false'],
+    ],
+    'IntlDateFormatter::getLocale' => [
+        'old' => ['string', 'which='=>'int'],
+        'new' => ['string|false', 'type='=>'int'],
+    ],
+    'IntlDateFormatter::getPattern' => [
+        'old' => ['string'],
+        'new' => ['string|false'],
+    ],
+    'IntlDateFormatter::getTimeType' => [
+        'old' => ['int'],
+        'new' => ['int|false'],
+    ],
+    'IntlDateFormatter::getTimeZoneId' => [
+        'old' => ['string'],
+        'new' => ['string|false'],
+    ],
+    'IntlDateFormatter::localtime' => [
+        'old' => ['array', 'value'=>'string', '&rw_position='=>'int'],
+        'new' => ['array|false', 'string'=>'string', '&rw_offset='=>'int'],
+    ],
+    'IntlDateFormatter::parse' => [
+        'old' => ['int|float', 'value'=>'string', '&rw_position='=>'int'],
+        'new' => ['int|float|false', 'string'=>'string', '&rw_offset='=>'int'],
+    ],
+    'IntlDateFormatter::setCalendar' => [
+        'old' => ['bool', 'which'=>'IntlCalendar|int|null'],
+        'new' => ['bool', 'calendar'=>'IntlCalendar|int|null'],
+    ],
+    'IntlDateFormatter::setLenient' => [
+        'old' => ['bool', 'lenient'=>'bool'],
+        'new' => ['void', 'lenient'=>'bool'],
+    ],
+    'IntlDateFormatter::setTimeZone' => [
+        'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
+        'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
+    ],
     'PDOStatement::bindColumn' => [
       'old' => ['bool', 'column'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'],
       'new' => ['bool', 'column'=>'mixed', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'],

diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
@@ -461,6 +461,14 @@
         'old' => ['string|false', 'option'=>'string', 'value'=>'string'],
         'new' => ['string|false', 'option'=>'string', 'value'=>'string|int|float|bool|null'],
     ],
+    'IntlDateFormatter::__construct' => [
+        'old' => ['void', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+        'new' => ['void', 'locale'=>'?string', 'dateType='=>'int', 'timeType='=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    ],
+    'IntlDateFormatter::create' => [
+      'old' => ['?IntlDateFormatter', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+      'new' => ['?IntlDateFormatter', 'locale'=>'?string', 'dateType='=>'int', 'timeType='=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    ],
     'ldap_add' => [
       'old' => ['bool', 'ldap'=>'resource', 'dn'=>'string', 'entry'=>'array', 'controls='=>'array'],
       'new' => ['bool', 'ldap'=>'LDAP\Connection', 'dn'=>'string', 'entry'=>'array', 'controls='=>'?array'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -3340,28 +3340,27 @@
     'IntlCodePointBreakIterator::preceding' => ['int', 'offset'=>'string'],
     'IntlCodePointBreakIterator::previous' => ['int'],
     'IntlCodePointBreakIterator::setText' => ['bool', 'text'=>'string'],
-    'IntlDateFormatter::__construct' => ['void', 'locale'=>'?string', 'datetype'=>'?int', 'timetype'=>'?int', 'timezone='=>'null|string|IntlTimeZone|DateTimeZone', 'calendar='=>'null|int|IntlCalendar', 'pattern='=>'string'],
-    'IntlDateFormatter::create' => ['IntlDateFormatter|false', 'locale'=>'?string', 'datetype'=>'?int', 'timetype'=>'?int', 'timezone='=>'null|string|IntlTimeZone|DateTimeZone', 'calendar='=>'int|IntlCalendar', 'pattern='=>'string'],
-    'IntlDateFormatter::format' => ['string|false', 'args'=>''],
-    'IntlDateFormatter::formatObject' => ['string|false', 'object'=>'object', 'format='=>'mixed', 'locale='=>'string'],
+    'IntlDateFormatter::__construct' => ['void', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    'IntlDateFormatter::create' => ['?IntlDateFormatter', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
+    'IntlDateFormatter::format' => ['string|false', 'value'=>'IntlCalendar|DateTime|array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int}|array{tm_sec: int, tm_min: int, tm_hour: int, tm_mday: int, tm_mon: int, tm_year: int, tm_wday: int, tm_yday: int, tm_isdst: int}|string|int|float'],
+    'IntlDateFormatter::formatObject' => ['string|false', 'object'=>'IntlCalendar|DateTime', 'format='=>'array{0: int, 1: int}|int|string|null', 'locale='=>'?string'],
     'IntlDateFormatter::getCalendar' => ['int'],
     'IntlDateFormatter::getCalendarObject' => ['IntlCalendar'],
     'IntlDateFormatter::getDateType' => ['int'],
     'IntlDateFormatter::getErrorCode' => ['int'],
     'IntlDateFormatter::getErrorMessage' => ['string'],
-    'IntlDateFormatter::getLocale' => ['string|false'],
+    'IntlDateFormatter::getLocale' => ['string', 'which='=>'int'],
     'IntlDateFormatter::getPattern' => ['string'],
     'IntlDateFormatter::getTimeType' => ['int'],
     'IntlDateFormatter::getTimeZone' => ['IntlTimeZone|false'],
     'IntlDateFormatter::getTimeZoneId' => ['string'],
     'IntlDateFormatter::isLenient' => ['bool'],
-    'IntlDateFormatter::localtime' => ['array', 'text_to_parse'=>'string', '&w_parse_pos='=>'int'],
-    'IntlDateFormatter::parse' => ['int|false', 'text_to_parse'=>'string', '&rw_parse_pos='=>'int'],
-    'IntlDateFormatter::setCalendar' => ['bool', 'calendar'=>''],
+    'IntlDateFormatter::localtime' => ['array', 'value'=>'string', '&rw_position='=>'int'],
+    'IntlDateFormatter::parse' => ['int|float', 'value'=>'string', '&rw_position='=>'int'],
+    'IntlDateFormatter::setCalendar' => ['bool', 'which'=>'IntlCalendar|int|null'],
     'IntlDateFormatter::setLenient' => ['bool', 'lenient'=>'bool'],
     'IntlDateFormatter::setPattern' => ['bool', 'pattern'=>'string'],
-    'IntlDateFormatter::setTimeZone' => ['bool', 'timezone'=>''],
-    'IntlDateFormatter::setTimeZoneId' => ['bool', 'zone'=>'string', 'fmt='=>'IntlDateFormatter'],
+    'IntlDateFormatter::setTimeZone' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
     'IntlException::__clone' => ['void'],
     'IntlException::__construct' => ['void'],
     'IntlException::__toString' => ['string'],