Skip to content

RegexArrayShapeMatcher - optional non-last groups can be empty-string #3306

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 4 commits into from
Aug 8, 2024
Merged

RegexArrayShapeMatcher - optional non-last groups can be empty-string #3306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca7703e
RegexArrayShapeMatcher - optional non-last groups can be empty-string
staabm Aug 8, 2024
f596950
Update preg_match_shapes.php
staabm Aug 8, 2024
0b4e5c6
fix
staabm Aug 8, 2024
4ab70e2
fix php 7.2
staabm Aug 8, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@staabm
staabm committed Aug 8, 2024
commit 0b4e5c6d3932d8d4468a23f4e413d381a1bb006a
18 changes: 12 additions & 6 deletions src/Type/Php/RegexArrayShapeMatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,9 @@ private function isGroupOptional(RegexCapturingGroup $captureGroup, TrinaryLogic

private function createGroupValueType(RegexCapturingGroup $captureGroup, TrinaryLogic $wasMatched, int $flags, bool $isTrailingOptional, bool $isLastGroup, bool $matchesAll): Type
{
$groupValueType = $this->getValueType($captureGroup->getType(), $flags, $matchesAll);

if ($matchesAll) {
$groupValueType = $this->getValueType($captureGroup->getType(), $flags, $matchesAll);

if (!$isTrailingOptional && $this->containsUnmatchedAsNull($flags, $matchesAll) && !$captureGroup->isOptional()) {
$groupValueType = TypeCombinator::removeNull($groupValueType);
}
Expand All @@ -412,16 +412,22 @@ private function createGroupValueType(RegexCapturingGroup $captureGroup, Trinary
return $groupValueType;
}

if (!$isLastGroup && !$this->containsUnmatchedAsNull($flags, $matchesAll) && $captureGroup->isOptional()) {
$groupValueType = $this->getValueType(
TypeCombinator::union($captureGroup->getType(), new ConstantStringType('')),
$flags,
$matchesAll
);
} else {
$groupValueType = $this->getValueType($captureGroup->getType(), $flags, $matchesAll);
}

if ($wasMatched->yes()) {
if (!$isTrailingOptional && $this->containsUnmatchedAsNull($flags, $matchesAll) && !$captureGroup->isOptional()) {
$groupValueType = TypeCombinator::removeNull($groupValueType);
}
}

if (!$isLastGroup && !$this->containsUnmatchedAsNull($flags, $matchesAll) && $captureGroup->isOptional()) {
$groupValueType = TypeCombinator::union($groupValueType, new ConstantStringType(''));
}

return $groupValueType;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/PHPStan/Analyser/nsrt/preg_replace_callback_shapes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function (string $s): void {
preg_replace_callback(
'/(foo)?(bar)?(baz)?/',
function ($matches) {
assertType("array{0: array{string, int<0, max>}, 1?: array{'foo', int<0, max>}, 2?: array{'bar', int<0, max>}, 3?: array{'baz', int<0, max>}}", $matches);
assertType("array{0: array{string, int<0, max>}, 1?: array{''|'foo', int<0, max>}, 2?: array{''|'bar', int<0, max>}, 3?: array{'baz', int<0, max>}}", $matches);
return '';
},
$s,
Expand Down