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

Fix #5239 - make replacement work in 7.1-7.3

Browse Source
This commit is contained in:
Matt Brown 2021-02-17 16:54:11 -05:00
parent b5ab0ff38b
commit e93e532e4e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Psalm/Internal/PhpVisitor/PartialParserVisitor.php
View File

@ -181,22 +181,24 @@ class PartialParserVisitor extends PhpParser\NodeVisitorAbstract
// if(...);
//
// This transformation will break that.
$fake_class = \preg_replace_callback(
\preg_match_all(
'/(->|::)(\n\s*(if|list)\s*\()/',
function (array $match) use (&$extra_characters) {
/**
* @var array<int, array{int, int}> $match
* @psalm-suppress MixedArrayAssignment
*/
$extra_characters[] = $match[2][1];
return $match[1][0] . ';' . $match[2][0];
},
$fake_class,
-1,
$count,
\PREG_OFFSET_CAPTURE
$matches,
\PREG_OFFSET_CAPTURE | \PREG_SET_ORDER
);
foreach ($matches as $match) {
$fake_class = \substr_replace(
$fake_class,
$match[1][0] . ';' . $match[2][0],
$match[0][1],
\strlen($match[0][0])
);
$extra_characters[] = $match[2][1];
}
$replacement_stmts = $this->parser->parse(
$fake_class,
$error_handler
@ -241,7 +243,6 @@ class PartialParserVisitor extends PhpParser\NodeVisitorAbstract
$extra_offsets = [];
/** @var int $extra_offset */
foreach ($extra_characters as $extra_offset) {
$l = strlen($fake_class);