Skip to content
/ rector-src Public

[CodeQuality] Handle intersection on OptionalParametersAfterRequiredRector #7223

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
samsonasik merged 1 commit into from
Sep 6, 2025
Merged

[CodeQuality] Handle intersection on OptionalParametersAfterRequiredRector #7223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 0 deletions ...ity/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/typed_params.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ class TypedParams
function run3($optional = 1, null|int $required)
{
}

function run4($optional = 1, A&B $required)
{
}
}

?>
Expand All @@ -36,6 +40,10 @@ class TypedParams
function run3($optional = 1, null|int $required = null)
{
}

function run4($optional = 1, (A&B)|null $required = null)
{
}
}

?>
21 changes: 13 additions & 8 deletions rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,32 +85,37 @@ public function refactor(Node $node): ClassMethod|Function_|null
$hasChanged = true;

$param->default = new ConstFetch(new Name('null'));
$paramType = $param->type;

if (! $paramType instanceof Node) {
if (! $param->type instanceof Node) {
continue;
}

if ($paramType instanceof NullableType) {
if ($param->type instanceof NullableType) {
continue;
}

if ($paramType instanceof UnionType || $paramType instanceof IntersectionType) {
foreach ($paramType->types as $unionedType) {
if ($param->type instanceof UnionType) {
foreach ($param->type->types as $unionedType) {
if ($unionedType instanceof Identifier && $this->isName($unionedType, 'null')) {
continue 2;
}
}

$paramType->types[] = new Identifier('null');
$param->type->types[] = new Identifier('null');
continue;
}

if ($paramType instanceof ComplexType) {
if ($param->type instanceof IntersectionType) {
$param->type = new UnionType([$param->type, new Identifier('null')]);

continue;
}

if ($param->type instanceof ComplexType) {
continue;
}

$param->type = new NullableType($paramType);
$param->type = new NullableType($param->type);
}
}

Expand Down
Loading