-
Notifications
You must be signed in to change notification settings - Fork 475
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
More precise signatures for mb_* functions #717
Conversation
'mb_strstr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'], | ||
'mb_strtolower' => ['string', 'str'=>'string', 'encoding='=>'string'], | ||
'mb_strtoupper' => ['string', 'str'=>'string', 'encoding='=>'string'], | ||
'mb_strwidth' => ['int', 'str'=>'string', 'encoding='=>'string'], | ||
'mb_strwidth' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.. working on the test errors.. |
rebased |
Still doesn't pass. |
@@ -74,6 +75,11 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection, | |||
$returnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType(); | |||
$positionEncodingParam = $this->encodingPositionMap[$functionReflection->getName()]; | |||
|
|||
// php8-stubs define a regular int return-type for mb_strlen. use a more precise type instead. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it seems ParametersAcceptorSelector::selectSingle
doesn't pick the return type from the functionMap but from the php8 stubs, where mb_strlen
is defined with a int
return type.
therefore we need this additional if-case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you try putting 0|positive-int
return type in functionMap_php80delta.php
and delete this condition? It might work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahh that worked - thanks!
Thank you! |
inspired by the correspsonding non-mb functions