Skip to content

[PHPUnit90] Speed up AssertRegExpRector with cheap method-name gate #796

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
TomasVotruba merged 2 commits into from
Oct 16, 2026
+16 −5
Merged

[PHPUnit90] Speed up AssertRegExpRector with cheap method-name gate #796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e3ada3
[PHPUnit90] Add cheap method-name gate before TestCase type resolutio…
TomasVotruba Oct 10, 2026
cadb38f
[PHPUnit90] Gate on preg_match arg before TestCase type resolution
TomasVotruba Oct 16, 2026
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
21 changes: 16 additions & 5 deletions rules/PHPUnit90/Rector/MethodCall/AssertRegExpRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ public function refactor(Node $node): ?Node
continue;
}

if (! $this->testsNodeAnalyzer->isPHPUnitMethodCallNames(
$stmt->expr,
// cheap name gate before the costly TestCase type resolution below
if (! $this->isNames(
$stmt->expr->name,
[self::ASSERT_SAME, self::ASSERT_EQUALS, self::ASSERT_NOT_SAME, self::ASSERT_NOT_EQUALS]
)) {
continue;
Expand All @@ -108,10 +109,13 @@ public function refactor(Node $node): ?Node
continue;
}

/** @var FuncCall|Node $secondArgumentValue */
$secondArgumentValue = $stmt->expr->getArgs()[1]
->value;
$callArgs = $stmt->expr->getArgs();
if (! isset($callArgs[1])) {
continue;
}

// cheap preg_match arg gate before the costly TestCase type resolution below
$secondArgumentValue = $callArgs[1]->value;
if (! $secondArgumentValue instanceof FuncCall) {
continue;
}
Expand All @@ -124,6 +128,13 @@ public function refactor(Node $node): ?Node
continue;
}

if (! $this->testsNodeAnalyzer->isPHPUnitMethodCallNames(
$stmt->expr,
[self::ASSERT_SAME, self::ASSERT_EQUALS, self::ASSERT_NOT_SAME, self::ASSERT_NOT_EQUALS]
)) {
continue;
}

$oldMethodName = $this->getName($stmt->expr->name);
if ($oldMethodName === null) {
continue;
Expand Down
Loading