Skip to content

fix: Allow variadic syntax in PHPDoc parameter annotation in gen_stub.php #20342

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
kocsismate merged 3 commits into from
Dec 27, 2025
Merged

fix: Allow variadic syntax in PHPDoc parameter annotation in gen_stub.php #20342

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e5214b
fix: Allow variadic syntax in PHPDoc parameter annotation in `gen_stu…
mitelg Oct 30, 2025
ae179e4
Simplify
iluuu1994 Dec 4, 2025
f50b86f
Also re-add non-capture group
iluuu1994 Dec 4, 2025
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
8 changes: 4 additions & 4 deletions build/gen_stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3323,12 +3323,12 @@ public function getType(): string {
$matches = [];

if ($this->name === "param") {
preg_match('/^\s*([\w\|\\\\\[\]<>, ]+)\s*(?:[{(]|\$\w+).*$/', $value, $matches);
preg_match('/^\s*([\w\|\\\\\[\]<>, ]+)\s*(?<type>[{(]|(\.\.\.)?\$\w+).*$/', $value, $matches);
} elseif ($this->name === "return" || $this->name === "var") {
preg_match('/^\s*([\w\|\\\\\[\]<>, ]+)/', $value, $matches);
preg_match('/^\s*(?<type>[\w\|\\\\\[\]<>, ]+)/', $value, $matches);
}

if (!isset($matches[1])) {
if (!isset($matches["type"])) {
throw new Exception("@$this->name doesn't contain a type or has an invalid format \"$value\"");
}

Expand All @@ -3345,7 +3345,7 @@ public function getVariableName(): string {

if ($this->name === "param") {
// Allow for parsing extended types like callable(string):mixed in docblocks
preg_match('/^\s*(?<type>[\w\|\\\\]+(?<parens>\((?<inparens>(?:(?&parens)|[^(){}[\]]*+))++\)|\{(?&inparens)\}|\[(?&inparens)\])*+(?::(?&type))?)\s*\$(?<name>\w+).*$/', $value, $matches);
preg_match('/^\s*(?<type>[\w\|\\\\]+(?<parens>\((?<inparens>(?:(?&parens)|[^(){}[\]]*+))++\)|\{(?&inparens)\}|\[(?&inparens)\])*+(?::(?&type))?)\s*(\.\.\.)?\$(?<name>\w+).*$/', $value, $matches);
} elseif ($this->name === "prefer-ref") {
preg_match('/^\s*\$(?<name>\w+).*$/', $value, $matches);
}
Expand Down
Loading