Improve preg_split() function ReturnType
#3757
Open
+190
−32
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has been marked as ready for review. |
zonuexe
reviewed
Dec 26, 2024
| } else { | ||
| $flagType = $scope->getType($flagArg->value); | ||
| $flags = $flagType->getConstantScalarValues(); | ||
| } |
There was a problem hiding this comment.
By replacing it as follows, type checking within multiple Constant loops will no longer be necessary.
$flags = [];
$flagType = $scope->getType($flagArg->value);
foreach ($flagType->getConstantScalarValues() as $flag) {
if (!is_int()) {
return new ErrorType();
}
$flags[] = $flag;
}
| @@ -9081,7 +9081,7 @@ | |||
| 'preg_replace' => ['string|array|null', 'regex'=>'string|array', 'replace'=>'string|array', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'], | |||
| 'preg_replace_callback' => ['string|array|null', 'regex'=>'string|array', 'callback'=>'callable(array<int|string, string>):string', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'], | |||
| 'preg_replace_callback_array' => ['string|array|null', 'pattern'=>'array<string,callable>', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'], | |||
| 'preg_split' => ['list<string>|false', 'pattern'=>'string', 'subject'=>'string', 'limit='=>'?int', 'flags='=>'int'], | |||
| 'preg_split' => ['__benevolent<list<string>|list<array{string, int<0, max>}>|false>', 'pattern'=>'string', 'subject'=>'string', 'limit='=>'?int', 'flags='=>'int'], | |||
There was a problem hiding this comment.
The other preg_ method are not using benevolent union, so I would think more consistent to not use a benevolent union here too.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I developed further extended the extension for the
preg_split()function.The
preg_split()function can specify ReturnType with the following cases:$patternargument is invalid.$patternand$subjectarguments are constants.$subjectargument is non-empty-string.$flagargument is set to one or more of the following:PREG_SPLIT_OFFSET_CAPTURE,PREG_SPLIT_NO_EMPTY, orPREG_SPLIT_DELIM_CAPTURE.The detailed cases are specified in the test cases.
Additionally, the current default return type is set to
list<string>|false. However, depending on the flags, it also returnlist<array{string, int<0, max>}>. To account for this, I have added support for this possibility and applied a benevolent union to cover all three types. So, I set__benevolent<list<string>|list<array{string, int<0, max>}>|false>to the basic return type.