Skip to content

Support posix character classes in preg_match() inference #3241

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

Closed
wants to merge 1 commit into from
Closed

Support posix character classes in preg_match() inference #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions patches/Grammar.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
diff --git a/Grammar.pp b/Grammar.pp
index 5157084..8384417 100644
index 5157084..48959cb 100644
--- a/Grammar.pp
+++ b/Grammar.pp
@@ -73,7 +73,7 @@
@@ -50,6 +50,8 @@
%token class_ \[
%token _class \]
%token range \-
+%token class_literal [^\\\[\]-]
+%token posix_class \[^?:[a-z]+:\]

// Internal options.
%token internal_option \(\?[\-+]?[imsx]\)
@@ -73,7 +75,7 @@
%token co:comment .*?(?=(?<!\\)\))

// Capturing group.
Expand All @@ -11,7 +20,7 @@ index 5157084..8384417 100644
%token nc:_named_capturing > -> default
%token nc:capturing_name .+?(?=(?<!\\)>)
%token non_capturing_ \(\?:
@@ -109,7 +109,7 @@
@@ -109,7 +111,7 @@
// Please, see PCRESYNTAX(3), General Category properties, PCRE special category
// properties and script names for \p{} and \P{}.
%token character_type \\([CdDhHNRsSvVwWX]|[pP]{[^}]+})
Expand All @@ -20,16 +29,16 @@ index 5157084..8384417 100644
%token match_point_reset \\K
%token literal \\.|.

@@ -168,7 +168,7 @@ quantifier:
@@ -168,7 +170,7 @@ quantifier:
::negative_class_:: #negativeclass
| ::class_::
)
- ( range() | literal() )+
+ ( <class_> | range() | literal() )+
+ ( <posix_class> | <class_> | range() | literal() | <class_literal> )+ <range>?
::_class::

#range:
@@ -178,7 +178,7 @@ simple:
@@ -178,7 +180,7 @@ simple:
capturing()
| literal()

Expand All @@ -38,7 +47,7 @@ index 5157084..8384417 100644
::comment_:: <comment>? ::_comment:: #comment
| (
::named_capturing_:: <capturing_name> ::_named_capturing:: #namedcapturing
@@ -191,6 +191,7 @@ capturing:
@@ -191,6 +193,7 @@ capturing:

literal:
<character>
Expand Down
6 changes: 6 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 @@ -437,3 +437,9 @@ function (string $s, $mixed): void {
}
assertType('array<string>', $matches);
};

function bug11323(string $s): void {
if (preg_match('/([*|+?{}()]+)([^*|+[:digit:]?{}()]+)/', $s, $matches)) {
assertType('array{string, string, string}', $matches);
}
}
Loading