Skip to content
/ rector-src Public

[type-declarations] allow coalesce not on full variable, but dim fetch in StrictArrayParamDimFetchRector #7404

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 1 commit into from
Oct 3, 2025
Merged

[type-declarations] allow coalesce not on full variable, but dim fetch in StrictArrayParamDimFetchRector #7404

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
27 changes: 27 additions & 0 deletions ...aration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/direct-coalesce.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;

final class DirectCoalesce
{
public function run($productOptions)
{
return $productOptions['list'] ?? 'default';
}
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;

final class DirectCoalesce
{
public function run(array $productOptions)
{
return $productOptions['list'] ?? 'default';
}
}

?>
2 changes: 1 addition & 1 deletion ...FetchRector/Fixture/skip_coalesce.php.inc → ...e/skip_coalesce_without_dim_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;

final class SkipCoalesce
final class SkipCoalesceWithoutDimFetch
{
public function run($productOptions)
{
Expand Down
8 changes: 2 additions & 6 deletions rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ private function shouldStop(Node $node, Param $param, string $paramName): bool
$nodeToCheck = $node->var;
}

if ($this->isMethodCallOrArrayDimFetch($paramName, $nodeToCheck)) {
if ($this->isMethodCall($paramName, $nodeToCheck)) {
return true;
}

Expand Down Expand Up @@ -295,16 +295,12 @@ private function isEmptyOrEchoedOrCasted(Node $node, string $paramName): bool
return $node instanceof Array_ && $node->expr instanceof Variable && $this->isName($node->expr, $paramName);
}

private function isMethodCallOrArrayDimFetch(string $paramName, ?Node $node): bool
private function isMethodCall(string $paramName, ?Node $node): bool
{
if ($node instanceof MethodCall) {
return $node->var instanceof Variable && $this->isName($node->var, $paramName);
}

if ($node instanceof ArrayDimFetch) {
return $node->var instanceof Variable && $this->isName($node->var, $paramName);
}

return false;
}

Expand Down