RegexArrayShapeMatcher: fix nested capturing counting #3184
Conversation
|
Will have another look later |
clxmstaab
force-pushed
the
nested-capturing
branch
2 times, most recently
from
887cc67 to
778bdb3
Compare
| // add one capturing group to the end so all capture group keys | ||
| // are present in the $matches | ||
| // see https://3v4l.org/sOXbn, https://3v4l.org/3SdDM | ||
| $captureGroupsRegex = Strings::replace($regex, '~.[a-z\s]*$~i', '|(?<phpstanNamedCaptureGroupLast>)$0'); |
There was a problem hiding this comment.
reworked the matcher to be AST only -> no more php version differences
| @@ -172,10 +172,6 @@ public function dataFileAsserts(): iterable | |||
| yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-9499.php'); | |||
| } | |||
|
|
|||
| if (PHP_VERSION_ID >= 70300 && PHP_VERSION_ID < 70400) { | |||
| yield from $this->gatherAssertTypes(__DIR__ . '/data/preg_match_shapes_php73.php'); | |||
There was a problem hiding this comment.
this test is contained in preg_match_shapes_php.php with proper expectations across all php versions. we no longer need separate expectations for 7.2/7.3
|
I did not yet figure out, how/why the result of the last failling test-case can be different on 7.2/7.3 |
I now know what the cause of the problem is: in PHP 7.2/7.3 the parameter is named "subpatterns" and in 7.4+ its "matches" |
clxmstaab
force-pushed
the
nested-capturing
branch
from
ae1c954 to
7ebf48c
Compare
| @@ -485,3 +485,20 @@ function ($s, $t): void { | |||
| assertType('string', $s); | |||
| assertType('string', $t); | |||
| }; | |||
|
|
|||
| function fooMatch(string $input): void { | |||
There was a problem hiding this comment.
expectations have been harmonized across php versions, therefore the 2 variants above removed and the tests moved with same expectations in this common file
|
@ondrejmirtes would be great to get this one merged, as it is now php version independent and in turn would also allow to fix the phpstan-nette build. it fixes all currently known problems ( |
|
Purrrrfect! |
|
Thank you! |
closes phpstan/phpstan#11221