Merge pull request #5608 from paxal/patch/preg_replace_callback

Allow to use string key for preg_replace_callback callable argument
vimeo · Jul 11, 2021 · 83bf9b8 · 83bf9b8
2 parents d1f894a + c45e47d
commit 83bf9b8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -10248,8 +10248,8 @@
 'preg_match_all' => ['int|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'array', 'flags='=>'int', 'offset='=>'int'],
 'preg_quote' => ['string', 'str'=>'string', 'delimiter='=>'string'],
 'preg_replace' => ['string|string[]|null', 'pattern'=>'string|array', 'replacement'=>'string|array', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'],
-'preg_replace_callback' => ['string|null', 'pattern'=>'string|array', 'callback'=>'callable(array<int, string>):string', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int'],
-'preg_replace_callback\'1' => ['string[]|null', 'pattern'=>'string|array', 'callback'=>'callable(array<int, string>):string', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int'],
+'preg_replace_callback' => ['string|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int'],
+'preg_replace_callback\'1' => ['string[]|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string[]', 'limit='=>'int', '&w_count='=>'int'],
 'preg_replace_callback_array' => ['string|string[]|null', 'pattern'=>'array<string,callable(array):string>', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'],
 'preg_split' => ['list<string>|false', 'pattern'=>'string', 'subject'=>'string', 'limit'=>'int', 'flags='=>'null'],
 'preg_split\'1' => ['list<string>|list<list<string|int>>|false', 'pattern'=>'string', 'subject'=>'string', 'limit='=>'int', 'flags='=>'int'],

diff --git a/src/Psalm/ErrorBaseline.php b/src/Psalm/ErrorBaseline.php
@@ -293,7 +293,7 @@ function (string $extension) : string {
         $xml = preg_replace_callback(
             '/<files (psalm-version="[^"]+") (?:php-version="(.+)"(\/?>)\n)/',
             /**
-             * @param array<int, string> $matches
+             * @param string[] $matches
              */
             function (array $matches) : string {
                 return

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -887,7 +887,7 @@ function preg_replace($search, $replace, $subject, int $limit = -1, &$count = nu
 
 /**
  * @param string|string[] $search
- * @param callable(array<int, string>):string $replace
+ * @param callable(string[]):string $replace
  * @param string|array<string|int|float> $subject
  * @param int $count
  * @return ($subject is array ? array<string>|null : string|null)

diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -1299,7 +1299,7 @@ function takesInt(int $i) : void {}
                     function foo(string $s) : string {
                         return preg_replace_callback(
                             \'/<files (psalm-version="[^"]+") (?:php-version="(.+)">\n)/\',
-                            /** @param array<int, string> $matches */
+                            /** @param string[] $matches */
                             function (array $matches) : string {
                                 return $matches[1];
                             },