Skip to content

PhpFileCleaner: Use strcspn instead of regex for fast-skip in clean() #5600

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
staabm merged 2 commits into from
May 5, 2026
+20 −21
Merged

PhpFileCleaner: Use strcspn instead of regex for fast-skip in clean() #5600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89efdf
PhpFileCleaner: Use strcspn instead of regex for fast-skip in clean()
staabm May 5, 2026
5b528a2
Apply strcspn / strspn optimization to the rest of PhpFileCleaner
staabm May 5, 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
41 changes: 20 additions & 21 deletions src/Reflection/BetterReflection/SourceLocator/PhpFileCleaner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
use function in_array;
use function preg_match;
use function preg_quote;
use function strcspn;
use function strlen;
use function strspn;
use function substr;

/**
Expand All @@ -20,7 +22,7 @@ final class PhpFileCleaner
/** @var array<array{name: string, length: int, pattern: string}> */
private array $typeConfig = [];

private string $restPattern;
private string $rejectChars;

private string $contents = '';

Expand All @@ -38,7 +40,7 @@ public function __construct()
];
}

$this->restPattern = '{[^{}?"\'</d' . implode('', array_keys($this->typeConfig)) . ']+}A';
$this->rejectChars = '{}?"\'</d' . implode('', array_keys($this->typeConfig));
}

public function clean(string $contents, int $maxMatches): string
Expand Down Expand Up @@ -150,9 +152,10 @@ public function clean(string $contents, int $maxMatches): string
}

$this->index += 1;
if ($this->match($this->restPattern, $match)) {
$clean .= $char . $match[0];
$this->index += strlen($match[0]);
$skip = strcspn($this->contents, $this->rejectChars, $this->index);
if ($skip > 0) {
$clean .= $char . substr($this->contents, $this->index, $skip);
$this->index += $skip;
} else {
$clean .= $char;
}
Expand Down Expand Up @@ -203,8 +206,13 @@ private function consumeString(string $delimiter): string

private function skipString(string $delimiter): void
{
$rejectChars = '\\' . $delimiter;
$this->index += 1;
while ($this->index < $this->len) {
$this->index += strcspn($this->contents, $rejectChars, $this->index);
if ($this->index >= $this->len) {
break;
}
if ($this->contents[$this->index] === '\\' && ($this->peek('\\') || $this->peek($delimiter))) {
$this->index += 2;
continue;
Expand All @@ -221,7 +229,9 @@ private function skipComment(): void
{
$this->index += 2;
while ($this->index < $this->len) {
if ($this->contents[$this->index] === '*' && $this->peek('/')) {
$this->index += strcspn($this->contents, '*', $this->index);

if ($this->peek('/')) {
$this->index += 2;
break;
}
Expand All @@ -232,12 +242,7 @@ private function skipComment(): void

private function skipToNewline(): void
{
while ($this->index < $this->len) {
if (in_array($this->contents[$this->index], ["\r", "\n"], true)) {
return;
}
$this->index += 1;
}
$this->index += strcspn($this->contents, "\r\n", $this->index);
}

private function skipHeredoc(string $delimiter): void
Expand Down Expand Up @@ -265,16 +270,10 @@ private function skipHeredoc(string $delimiter): void
}

// skip the rest of the line
while ($this->index < $this->len) {
$this->skipToNewline();
$this->skipToNewline();

// skip newlines
while ($this->index < $this->len && ($this->contents[$this->index] === "\r" || $this->contents[$this->index] === "\n")) {
$this->index += 1;
}

break;
}
// skip newlines
$this->index += strspn($this->contents, "\r\n", $this->index);
}
}

Expand Down
Loading