Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix several spl callmap methods #9360

Merged
merged 1 commit into from
Feb 21, 2023
Merged

Fix several spl callmap methods #9360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
146 changes: 73 additions & 73 deletions dictionaries/CallMap.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dictionaries/CallMap_71_delta.php
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
*/
return [
'added' => [
'Closure::fromCallable' => ['Closure', 'callable'=>'callable'],
'Closure::fromCallable' => ['Closure', 'callback'=>'callable'],
'curl_multi_errno' => ['int|false', 'mh'=>'resource'],
'curl_share_errno' => ['int|false', 'sh'=>'resource'],
'curl_share_strerror' => ['?string', 'error_code'=>'int'],
Expand Down
2 changes: 2 additions & 0 deletions dictionaries/CallMap_73_delta.php
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@
'JsonException::getPrevious' => ['?Throwable'],
'JsonException::getTrace' => ['list<array{file?:string,line?:int,function:string,class?:class-string,type?:\'::\'|\'->\',args?:array<mixed>}>'],
'JsonException::getTraceAsString' => ['string'],
'Normalizer::getRawDecomposition' => ['?string', 'string'=>'string', 'form='=>'int'],
'SplPriorityQueue::isCorrupted' => ['bool'],
'array_key_first' => ['int|string|null', 'array'=>'array'],
'array_key_last' => ['int|string|null', 'array'=>'array'],
Expand All @@ -40,6 +41,7 @@
'hrtime' => ['array{0:int,1:int}|false', 'as_number='=>'false'],
'hrtime\'1' => ['int|float|false', 'as_number='=>'true'],
'is_countable' => ['bool', 'value'=>'mixed'],
'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string', 'form='=>'int'],
'net_get_interfaces' => ['array<string,array<string,mixed>>|false'],
'openssl_pkey_derive' => ['string|false', 'public_key'=>'mixed', 'private_key'=>'mixed', 'key_length='=>'?int'],
'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:?int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:?string}'],
Expand Down
16 changes: 12 additions & 4 deletions dictionaries/CallMap_74_delta.php
View file
Open in desktop
Expand Up @@ -25,13 +25,21 @@
'old' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
'new' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'?string'],
],
'SplFileObject::fwrite' => [
'old' => ['int', 'data'=>'string', 'length='=>'int'],
'new' => ['int|false', 'data'=>'string', 'length='=>'int'],
],
'SplTempFileObject::fwrite' => [
'old' => ['int', 'data'=>'string', 'length='=>'int'],
'new' => ['int|false', 'data'=>'string', 'length='=>'int'],
],
'array_merge' => [
'old' => ['array', '...arrays'=>'array'],
'new' => ['array', '...arrays='=>'array'],
'old' => ['array', '...arrays'=>'array'],
'new' => ['array', '...arrays='=>'array'],
],
'array_merge_recursive' => [
'old' => ['array', '...arrays'=>'array'],
'new' => ['array', '...arrays='=>'array'],
'old' => ['array', '...arrays'=>'array'],
'new' => ['array', '...arrays='=>'array'],
],
'gzread' => [
'old' => ['string|0', 'stream'=>'resource', 'length'=>'int'],
Expand Down
80 changes: 62 additions & 18 deletions dictionaries/CallMap_80_delta.php
View file
Open in desktop
Expand Up @@ -85,6 +85,10 @@
'old' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'string', 'line='=>'int', 'previous='=>'?Throwable'],
'new' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'?string', 'line='=>'?int', 'previous='=>'?Throwable'],
],
'finfo::__construct' => [
'old' => ['void', 'flags='=>'int', 'magic_database='=>'string'],
'new' => ['void', 'flags='=>'int', 'magic_database='=>'?string'],
],
'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'],
Expand Down Expand Up @@ -146,8 +150,28 @@
'new' => ['void', 'lenient'=>'bool'],
],
'IntlDateFormatter::setTimeZone' => [
'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'],
'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'],
],
'Locale::getDisplayLanguage' => [
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
],
'Locale::getDisplayName' => [
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
],
'Locale::getDisplayRegion' => [
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
],
'Locale::getDisplayScript' => [
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
],
'Locale::getDisplayVariant' => [
'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'],
'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'],
],
'NumberFormatter::__construct' => [
'old' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
Expand All @@ -157,18 +181,6 @@
'old' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'],
'new' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'?string'],
],
'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'],
],
'PDOStatement::bindParam' => [
'old' => ['bool', 'paramno'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'],
'new' => ['bool', 'param,'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'],
],
'PDOStatement::bindValue' => [
'old' => ['bool', 'paramno'=>'mixed', 'param'=>'mixed', 'type='=>'int'],
'new' => ['bool', 'param'=>'string|int', 'value'=>'mixed', 'type='=>'int'],
],
'PDOStatement::debugDumpParams' => [
'old' => ['void'],
'new' => ['bool|null'],
Expand All @@ -193,10 +205,6 @@
'old' => ['string|int|float|bool|null', 'column_number='=>'int'],
'new' => ['mixed', 'column='=>'int'],
],
'PDOStatement::fetchObject' => [
'old' => ['object|false', 'class_name='=>'string', 'ctor_args='=>'array'],
'new' => ['object|false', 'class='=>'?string', 'ctorArgs='=>'?array'],
],
'PDOStatement::setFetchMode' => [
'old' => ['bool', 'mode'=>'int'],
'new' => ['bool', 'mode'=>'int', '...args='=>'mixed'],
Expand Down Expand Up @@ -273,6 +281,42 @@
'old' => ['mixed', 'object='=>'object'],
'new' => ['mixed', 'object='=>'null|object'],
],
'SplFileInfo::getFileInfo' => [
'old' => ['SplFileInfo', 'class='=>'string'],
'new' => ['SplFileInfo', 'class='=>'?string'],
],
'SplFileInfo::getPathInfo' => [
'old' => ['SplFileInfo|null', 'class='=>'string'],
'new' => ['SplFileInfo|null', 'class='=>'?string'],
],
'SplFileInfo::openFile' => [
'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
],
'SplFileObject::getFileInfo' => [
'old' => ['SplFileInfo', 'class='=>'string'],
'new' => ['SplFileInfo', 'class='=>'?string'],
],
'SplFileObject::getPathInfo' => [
'old' => ['SplFileInfo|null', 'class='=>'string'],
'new' => ['SplFileInfo|null', 'class='=>'?string'],
],
'SplFileObject::openFile' => [
'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
],
'SplTempFileObject::getFileInfo' => [
'old' => ['SplFileInfo', 'class='=>'string'],
'new' => ['SplFileInfo', 'class='=>'?string'],
],
'SplTempFileObject::getPathInfo' => [
'old' => ['SplFileInfo|null', 'class='=>'string'],
'new' => ['SplFileInfo|null', 'class='=>'?string'],
],
'SplTempFileObject::openFile' => [
'old' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'],
'new' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'],
],
'tidy::__construct' => [
'old' => ['void', 'filename='=>'string', 'config='=>'array|string', 'encoding='=>'string', 'useIncludePath='=>'bool'],
'new' => ['void', 'filename='=>'?string', 'config='=>'array|string|null', 'encoding='=>'?string', 'useIncludePath='=>'bool'],
Expand Down
8 changes: 8 additions & 0 deletions dictionaries/CallMap_81_delta.php
View file
Open in desktop
Expand Up @@ -66,6 +66,14 @@
'old' => ['DOMDocumentFragment|false'],
'new' => ['DOMDocumentFragment'],
],
'SplFileObject::fputcsv' => [
'old' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'],
'new' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'],
],
'SplTempFileObject::fputcsv' => [
'old' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'],
'new' => ['int|false', 'fields'=>'array<array-key, null|scalar|Stringable>', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'],
],
'finfo_buffer' => [
'old' => ['string|false', 'finfo'=>'resource', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'],
'new' => ['string|false', 'finfo'=>'finfo', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'],
Expand Down