Skip to content

ArrayShapeMatcher - Don't optimize alternations with optional-groups for tagged-unions #3395

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
Sep 5, 2024
Merged

ArrayShapeMatcher - Don't optimize alternations with optional-groups for tagged-unions #3395

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
ca8675d
ArrayShapeMatcher - Don't optimize alternations with optional-groups …
staabm Sep 3, 2024
aa007c0
Update preg_match_shapes.php
staabm Sep 3, 2024
5d3895d
more tests
staabm Sep 4, 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
4 changes: 4 additions & 0 deletions src/Type/Php/RegexArrayShapeMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ private function getOnlyTopLevelAlternation(array $captureGroups): ?RegexAlterna
return null;
}

if ($captureGroup->inOptionalQuantification()) {
return null;
}

if ($alternation === null) {
$alternation = $captureGroup->getAlternation();
} elseif ($alternation->getId() !== $captureGroup->getAlternation()->getId()) {
Expand Down
5 changes: 5 additions & 0 deletions src/Type/Regex/RegexCapturingGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public function isOptional(): bool
|| $this->parent !== null && $this->parent->isOptional();
}

public function inOptionalQuantification(): bool
{
return $this->inOptionalQuantification;
}

public function inOptionalAlternation(): bool
{
if (!$this->inAlternation()) {
Expand Down
15 changes: 15 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 @@ -753,3 +753,18 @@ function bug11622 (string $expression): void {
assertType("array{string, string}", $matches);
}
}

function bug11604 (string $string): void {
if (! preg_match('/(XX)|(YY)?ZZ/', $string, $matches)) {
return;
}

assertType("array{0: string, 1?: ''|'XX', 2?: 'YY'}", $matches);
// could be array{string, '', 'YY'}|array{string, 'XX'}|array{string}
}

function bug11604b (string $string): void {
if (preg_match('/(XX)|(YY)?(ZZ)/', $string, $matches)) {
assertType("array{0: string, 1?: ''|'XX', 2?: ''|'YY', 3?: 'ZZ'}", $matches);
}
}
Loading