Skip to content

RegexArrayShapeMatcher - Fix PREG_UNMATCHED_AS_NULL with optional leading groups #3234

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 3 commits into from
Jul 14, 2024
Merged

RegexArrayShapeMatcher - Fix PREG_UNMATCHED_AS_NULL with optional leading groups #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e991fad
RegexArrayShapeMatcher - Fix PREG_UNMATCHED_AS_NULL with optional lea…
staabm Jul 14, 2024
1a20bb8
bring PREG_UNMATCHED_AS_NULL tests togehter
staabm Jul 14, 2024
ea579dc
remove misleading comment
staabm Jul 14, 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
2 changes: 1 addition & 1 deletion src/Type/Php/RegexArrayShapeMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private function buildArrayType(
} else {
if ($i < $countGroups - $trailingOptionals) {
$optional = false;
if ($this->containsUnmatchedAsNull($flags)) {
if ($this->containsUnmatchedAsNull($flags) && !$captureGroup->isOptional()) {
$groupValueType = TypeCombinator::removeNull($groupValueType);
}
} elseif ($this->containsUnmatchedAsNull($flags)) {
Expand Down
36 changes: 36 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-11311.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,39 @@ function unmatchedAsNullWithOptionalGroup(string $s): void {
assertType('array{}|array{string, string|null}', $matches);
}

function bug11331a(string $url):void {
// group a is actually optional as the entire (?:...) around it is optional
if (preg_match('{^
(?:
(?<a>.+)
)?
(?<b>.+)}mix', $url, $matches, PREG_UNMATCHED_AS_NULL)) {
assertType('array{0: string, a: string|null, 1: string|null, b: string, 2: string}', $matches);
}
}

function bug11331b(string $url):void {
if (preg_match('{^
(?:
(?<a>.+)
)?
(?<b>.+)?}mix', $url, $matches, PREG_UNMATCHED_AS_NULL)) {
assertType('array{0: string, a: string|null, 1: string|null, b: string|null, 2: string|null}', $matches);
}
}

function bug11331c(string $url):void {
if (preg_match('{^
(?:
(?:https?|git)://([^/]+)/ (?# group 1 here can be null if group 2 matches)
| (?# the alternation making it so that only either should match)
git@([^:]+):/? (?# group 2 here can be null if group 1 matches)
)
([^/]+)
/
([^/]+?)
(?:\.git|/)?
$}x', $url, $matches, PREG_UNMATCHED_AS_NULL)) {
assertType('array{string, string|null, string|null, string, string}', $matches);
}
}
Loading