Skip to content

RegexArrayShapeMatcher - Fix matching literal "-" in character classes #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 10, 2024
Merged

RegexArrayShapeMatcher - Fix matching literal "-" in character classes #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8cd771
RegexArrayShapeMatcher - Fix matching literal "-" in character classes
staabm Aug 9, 2024
d779ca4
fix literal "[" or "]" inside character classes
staabm Aug 9, 2024
59b5558
fix
staabm Aug 9, 2024
0a53825
fix php 7.2 build
staabm Aug 9, 2024
6349232
revert previous commit
staabm Aug 9, 2024
849ab7f
fix php 7.2-7.4 build
staabm Aug 9, 2024
b808642
simplify
staabm Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/Type/Regex/RegexGroupParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,6 @@ private function walkGroupAst(
if (!$inOptionalQuantification) {
$isNonEmpty = TrinaryLogic::createYes();
}
} elseif (!in_array($ast->getValueToken(), ['capturing_name'], true)) {
$onlyLiterals = null;
}
} elseif (!in_array($ast->getId(), ['#capturing', '#namedcapturing'], true)) {
$onlyLiterals = null;
Expand Down Expand Up @@ -508,16 +506,26 @@ private function getLiteralValue(TreeNode $node, ?array &$onlyLiterals, bool $ap
$token = $node->getValueToken();
$value = $node->getValueValue();

if (in_array($token, ['literal', 'escaped_end_class'], true)) {
if (
in_array($token, [
'literal', 'escaped_end_class',
// literal "-" in front/back of a character class like '[-a-z]' or '[abc-]', not forming a range
'range',
// literal "[" or "]" inside character classes '[[]' or '[]]'
'class_', '_class_literal',
], true)
) {
if (str_contains($patternModifiers, 'x') && trim($value) === '') {
return null;
}

if (strlen($value) > 1 && $value[0] === '\\') {
return substr($value, 1);
} elseif (
$value = substr($value, 1) ?: '';
}

if (
$appendLiterals
&& $token === 'literal'
&& in_array($token, ['literal', 'range', 'class_', '_class_literal'], true)
&& $onlyLiterals !== null
&& !in_array($value, ['.'], true)
) {
Expand All @@ -533,14 +541,8 @@ private function getLiteralValue(TreeNode $node, ?array &$onlyLiterals, bool $ap
return $value;
}

// literal "-" in front/back of a character class like '[-a-z]' or '[abc-]', not forming a range
if ($token === 'range') {
return $value;
}

// literal "[" or "]" inside character classes '[[]' or '[]]'
if (in_array($token, ['class_', '_class_literal'], true)) {
return $value;
if (!in_array($token, ['capturing_name'], true)) {
$onlyLiterals = null;
}

// character escape sequences, just return a fixed string
Expand Down
17 changes: 17 additions & 0 deletions tests/PHPStan/Analyser/nsrt/preg_match_shapes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,3 +699,20 @@ function (string $s): void {
preg_match('~a|(\d)|(\s)~', $s, $matches);
assertType("array{0?: string, 1?: '', 2?: non-empty-string}|array{0?: string, 1?: numeric-string}", $matches);
};

function bug11490 (string $expression): void {
$matches = [];

if (preg_match('/([-+])?([\d]+)%/', $expression, $matches) === 1) {
assertType("array{string, ''|'+'|'-', numeric-string}", $matches);
}
}

function bug11490b (string $expression): void {
$matches = [];

if (preg_match('/([\\[+])?([\d]+)%/', $expression, $matches) === 1) {
assertType("array{string, ''|'+'|'[', numeric-string}", $matches);
}
}

Loading