Skip to content

Commit a24aa96

Browse files
weirdanweirdan
authored
Merge pull request #9360 from othercorey/fix-spl-callmap
2 parents 28db105 + c62465c commit a24aa96

8 files changed

+229
-231
lines changed

‎dictionaries/CallMap.php

Lines changed: 73 additions & 73 deletions
Large diffs are not rendered by default.

‎dictionaries/CallMap_71_delta.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
return [
1818
'added' => [
19-
'Closure::fromCallable' => ['Closure', 'callable'=>'callable'],
19+
'Closure::fromCallable' => ['Closure', 'callback'=>'callable'],
2020
'curl_multi_errno' => ['int|false', 'mh'=>'resource'],
2121
'curl_share_errno' => ['int|false', 'sh'=>'resource'],
2222
'curl_share_strerror' => ['?string', 'error_code'=>'int'],

‎dictionaries/CallMap_73_delta.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'JsonException::getPrevious' => ['?Throwable'],
2929
'JsonException::getTrace' => ['list<array{file?:string,line?:int,function:string,class?:class-string,type?:\'::\'|\'->\',args?:array<mixed>}>'],
3030
'JsonException::getTraceAsString' => ['string'],
31+
'Normalizer::getRawDecomposition' => ['?string', 'string'=>'string', 'form='=>'int'],
3132
'SplPriorityQueue::isCorrupted' => ['bool'],
3233
'array_key_first' => ['int|string|null', 'array'=>'array'],
3334
'array_key_last' => ['int|string|null', 'array'=>'array'],
@@ -40,6 +41,7 @@
4041
'hrtime' => ['array{0:int,1:int}|false', 'as_number='=>'false'],
4142
'hrtime\'1' => ['int|float|false', 'as_number='=>'true'],
4243
'is_countable' => ['bool', 'value'=>'mixed'],
44+
'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string', 'form='=>'int'],
4345
'net_get_interfaces' => ['array<string,array<string,mixed>>|false'],
4446
'openssl_pkey_derive' => ['string|false', 'public_key'=>'mixed', 'private_key'=>'mixed', 'key_length='=>'?int'],
4547
'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:?int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:?string}'],

‎dictionaries/CallMap_74_delta.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
'old' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
2626
'new' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'?string'],
2727
],
28+
'SplFileObject::fwrite' => [
29+
'old' => ['int', 'data'=>'string', 'length='=>'int'],
30+
'new' => ['int|false', 'data'=>'string', 'length='=>'int'],
31+
],
32+
'SplTempFileObject::fwrite' => [
33+
'old' => ['int', 'data'=>'string', 'length='=>'int'],
34+
'new' => ['int|false', 'data'=>'string', 'length='=>'int'],
35+
],
2836
'array_merge' => [
29-
'old' => ['array', '...arrays'=>'array'],
30-
'new' => ['array', '...arrays='=>'array'],
37+
'old' => ['array', '...arrays'=>'array'],
38+
'new' => ['array', '...arrays='=>'array'],
3139
],
3240
'array_merge_recursive' => [
33-
'old' => ['array', '...arrays'=>'array'],
34-
'new' => ['array', '...arrays='=>'array'],
41+
'old' => ['array', '...arrays'=>'array'],
42+
'new' => ['array', '...arrays='=>'array'],
3543
],
3644
'gzread' => [
3745
'old' => ['string|0', 'stream'=>'resource', 'length'=>'int'],

‎dictionaries/CallMap_80_delta.php

Lines changed: 62 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@
8585
'old' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'string', 'line='=>'int', 'previous='=>'?Throwable'],
8686
'new' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'?string', 'line='=>'?int', 'previous='=>'?Throwable'],
8787
],
88+
'finfo::__construct' => [
89+
'old' => ['void', 'flags='=>'int', 'magic_database='=>'string'],
90+
'new' => ['void', 'flags='=>'int', 'magic_database='=>'?string'],
91+
],
8892
'IntlDateFormatter::__construct' => [
8993
'old' => ['void', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
9094
'new' => ['void', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'],
@@ -146,8 +150,28 @@
146150
'new' => ['void', 'lenient'=>'bool'],
147151
],
148152
'IntlDateFormatter::setTimeZone' => [
149-
'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
150-
'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
153+
'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
154+
'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
155+
],
156+
'Locale::getDisplayLanguage' => [
157+
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
158+
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
159+
],
160+
'Locale::getDisplayName' => [
161+
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
162+
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
163+
],
164+
'Locale::getDisplayRegion' => [
165+
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
166+
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
167+
],
168+
'Locale::getDisplayScript' => [
169+
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
170+
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
171+
],
172+
'Locale::getDisplayVariant' => [
173+
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
174+
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
151175
],
152176
'NumberFormatter::__construct' => [
153177
'old' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
@@ -157,18 +181,6 @@
157181
'old' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
158182
'new' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'?string'],
159183
],
160-
'PDOStatement::bindColumn' => [
161-
'old' => ['bool', 'column'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'],
162-
'new' => ['bool', 'column'=>'mixed', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'],
163-
],
164-
'PDOStatement::bindParam' => [
165-
'old' => ['bool', 'paramno'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'],
166-
'new' => ['bool', 'param,'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'],
167-
],
168-
'PDOStatement::bindValue' => [
169-
'old' => ['bool', 'paramno'=>'mixed', 'param'=>'mixed', 'type='=>'int'],
170-
'new' => ['bool', 'param'=>'string|int', 'value'=>'mixed', 'type='=>'int'],
171-
],
172184
'PDOStatement::debugDumpParams' => [
173185
'old' => ['void'],
174186
'new' => ['bool|null'],
@@ -193,10 +205,6 @@
193205
'old' => ['string|int|float|bool|null', 'column_number='=>'int'],
194206
'new' => ['mixed', 'column='=>'int'],
195207
],
196-
'PDOStatement::fetchObject' => [
197-
'old' => ['object|false', 'class_name='=>'string', 'ctor_args='=>'array'],
198-
'new' => ['object|false', 'class='=>'?string', 'ctorArgs='=>'?array'],
199-
],
200208
'PDOStatement::setFetchMode' => [
201209
'old' => ['bool', 'mode'=>'int'],
202210
'new' => ['bool', 'mode'=>'int', '...args='=>'mixed'],
@@ -273,6 +281,42 @@
273281
'old' => ['mixed', 'object='=>'object'],
274282
'new' => ['mixed', 'object='=>'null|object'],
275283
],
284+
'SplFileInfo::getFileInfo' => [
285+
'old' => ['SplFileInfo', 'class='=>'string'],
286+
'new' => ['SplFileInfo', 'class='=>'?string'],
287+
],
288+
'SplFileInfo::getPathInfo' => [
289+
'old' => ['SplFileInfo|null', 'class='=>'string'],
290+
'new' => ['SplFileInfo|null', 'class='=>'?string'],
291+
],
292+
'SplFileInfo::openFile' => [
293+
'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
294+
'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
295+
],
296+
'SplFileObject::getFileInfo' => [
297+
'old' => ['SplFileInfo', 'class='=>'string'],
298+
'new' => ['SplFileInfo', 'class='=>'?string'],
299+
],
300+
'SplFileObject::getPathInfo' => [
301+
'old' => ['SplFileInfo|null', 'class='=>'string'],
302+
'new' => ['SplFileInfo|null', 'class='=>'?string'],
303+
],
304+
'SplFileObject::openFile' => [
305+
'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
306+
'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
307+
],
308+
'SplTempFileObject::getFileInfo' => [
309+
'old' => ['SplFileInfo', 'class='=>'string'],
310+
'new' => ['SplFileInfo', 'class='=>'?string'],
311+
],
312+
'SplTempFileObject::getPathInfo' => [
313+
'old' => ['SplFileInfo|null', 'class='=>'string'],
314+
'new' => ['SplFileInfo|null', 'class='=>'?string'],
315+
],
316+
'SplTempFileObject::openFile' => [
317+
'old' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
318+
'new' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
319+
],
276320
'tidy::__construct' => [
277321
'old' => ['void', 'filename='=>'string', 'config='=>'array|string', 'encoding='=>'string', 'useIncludePath='=>'bool'],
278322
'new' => ['void', 'filename='=>'?string', 'config='=>'array|string|null', 'encoding='=>'?string', 'useIncludePath='=>'bool'],

‎dictionaries/CallMap_81_delta.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
'old' => ['DOMDocumentFragment|false'],
6767
'new' => ['DOMDocumentFragment'],
6868
],
69+
'SplFileObject::fputcsv' => [
70+
'old' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'],
71+
'new' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'],
72+
],
73+
'SplTempFileObject::fputcsv' => [
74+
'old' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'],
75+
'new' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'],
76+
],
6977
'finfo_buffer' => [
7078
'old' => ['string|false', 'finfo'=>'resource', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'],
7179
'new' => ['string|false', 'finfo'=>'finfo', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'],

0 commit comments

Comments
 (0)