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.

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

Update Locale signatures #2880

Merged
merged 2 commits into from
May 30, 2024
Merged

Conversation

devnix
Copy link
Contributor

@devnix devnix commented Jan 18, 2024

I'm not sure about documenting all optional parameters of Locale::composeLocale() as it has no effect when introducing non-documented parameters to the function, but I've reviewed all the functions, even the undocumented ones and AFAIK these are the correct signatures 😊

@devnix
Copy link
Contributor Author

devnix commented Jan 22, 2024

resources/functionMap.php Outdated Show resolved Hide resolved
@ondrejmirtes
Copy link
Member

That build failure is not the fault of this PR.

@ondrejmirtes
Copy link
Member

Also please get rid of the merge commit, the history should be linear (use rebase instead).

@devnix devnix force-pushed the locale-signatures branch 2 times, most recently from 71cbfc8 to 8b59c05 Compare January 28, 2024 22:31
@devnix
Copy link
Contributor Author

devnix commented Jan 28, 2024

I think this should do it 😄

@devnix devnix requested a review from ondrejmirtes January 28, 2024 22:33
@@ -125,6 +125,22 @@
'stream_socket_enable_crypto' => ['0|bool', 'stream'=>'resource', 'enable'=>'bool', 'crypto_method='=>'STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT|STREAM_CRYPTO_METHOD_SSLv23_CLIENT|STREAM_CRYPTO_METHOD_ANY_CLIENT|STREAM_CRYPTO_METHOD_TLS_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT|STREAM_CRYPTO_METHOD_SSLv2_SERVER|STREAM_CRYPTO_METHOD_SSLv3_SERVER|STREAM_CRYPTO_METHOD_SSLv23_SERVER|STREAM_CRYPTO_METHOD_ANY_SERVER|STREAM_CRYPTO_METHOD_TLS_SERVER|STREAM_CRYPTO_METHOD_TLSv1_0_SERVER|STREAM_CRYPTO_METHOD_TLSv1_1_SERVER|STREAM_CRYPTO_METHOD_TLSv1_2_SERVER|STREAM_CRYPTO_METHOD_TLSv1_3_SERVER', 'session_stream='=>'resource'],
'extract' => ['0|positive-int', '&rw_var_array'=>'array', 'extract_type='=>'EXTR_OVERWRITE|EXTR_SKIP|EXTR_PREFIX_SAME|EXTR_PREFIX_ALL|EXTR_PREFIX_INVALID|EXTR_IF_EXISTS|EXTR_PREFIX_IF_EXISTS|EXTR_REFS', 'prefix='=>'string|null'],
'RecursiveIteratorIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator|IteratorAggregate', 'mode='=>'RecursiveIteratorIterator::LEAVES_ONLY|RecursiveIteratorIterator::SELF_FIRST|RecursiveIteratorIterator::CHILD_FIRST', 'flags='=>'0|RecursiveIteratorIterator::CATCH_GET_CHILD'],
'Locale::acceptFromHttp' => ['non-empty-string|false', 'header'=>'string'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make return types more specific it can be put into functionMap.php, not bleeding edge. Only more specific parameter types need to be put into bleeding edge.

@devnix devnix requested a review from ondrejmirtes February 21, 2024 07:10
@devnix devnix force-pushed the locale-signatures branch from 3ab621b to 4e11792 Compare March 12, 2024 17:33
@ondrejmirtes ondrejmirtes changed the base branch from 1.10.x to 1.11.x May 30, 2024 13:32
@ondrejmirtes ondrejmirtes merged commit 366982a into phpstan:1.11.x May 30, 2024
434 of 440 checks passed
@ondrejmirtes
Copy link
Member

Thank you.

@lazka
Copy link

lazka commented May 30, 2024

Did this fix phpstan/phpstan#7855 ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants