danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Improve stubs for str_replace and preg_replace (#3495)

Browse Source 
* expand accepted values for str_replace and preg_replace. Make return conditional based on type of $subject

* Remove int|float from str_replace/preg_replace

Co-authored-by: Matthew Brown <github@muglug.com>
This commit is contained in:
orklah 2020-05-30 22:59:18 +02:00 committed by GitHub
parent 51bf7f38de
commit 428beb21fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Stubs/CoreGenericFunctions.phpstub
View File

@ -560,11 +560,11 @@ function htmlspecialchars_decode(string $string, ?int $quote_style = null) : str
/** /**
* @psalm-pure * @psalm-pure
* *
* @param string|string[] $search * @param string|array<string|int|float> $search
* @param string|string[] $replace * @param string|array<string|int|float> $replace
* @param string|string[] $subject * @param string|array<string|int|float> $subject
* @param int $count * @param int $count
* @return string|string[] * @return ($subject is array ? array<string> : string)
* *
* @psalm-flow ($replace, $subject) -> return * @psalm-flow ($replace, $subject) -> return
*/ */
@ -574,10 +574,10 @@ function str_replace($search, $replace, $subject, &$count = null) {}
* @psalm-pure * @psalm-pure
* *
* @param string|string[] $search * @param string|string[] $search
* @param string|string[] $replace * @param string|array<string|int|float> $replace
* @param string|string[] $subject * @param string|array<string|int|float> $subject
* @param int $count * @param int $count
* @return string|string[] * @return ($subject is array ? array<string> : string)
* *
* @psalm-flow ($replace, $subject) -> return * @psalm-flow ($replace, $subject) -> return
*/ */