diff --git a/rules/Naming/Contract/RenameParamValueObjectInterface.php b/rules/Naming/Contract/RenameParamValueObjectInterface.php index 8f661f072ed..a1ced3a001f 100644 --- a/rules/Naming/Contract/RenameParamValueObjectInterface.php +++ b/rules/Naming/Contract/RenameParamValueObjectInterface.php @@ -4,15 +4,12 @@ namespace Rector\Naming\Contract; -use PhpParser\Node\Expr\ArrowFunction; -use PhpParser\Node\Expr\Closure; +use PhpParser\Node\FunctionLike; use PhpParser\Node\Param; -use PhpParser\Node\Stmt\ClassMethod; -use PhpParser\Node\Stmt\Function_; interface RenameParamValueObjectInterface extends RenameValueObjectInterface { - public function getFunctionLike(): ClassMethod | Function_ | Closure | ArrowFunction; + public function getFunctionLike(): FunctionLike; public function getParam(): Param; } diff --git a/rules/Naming/ValueObject/ParamRename.php b/rules/Naming/ValueObject/ParamRename.php index 189eac88e32..c7529cbc61b 100644 --- a/rules/Naming/ValueObject/ParamRename.php +++ b/rules/Naming/ValueObject/ParamRename.php @@ -4,12 +4,9 @@ namespace Rector\Naming\ValueObject; -use PhpParser\Node\Expr\ArrowFunction; -use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\Variable; +use PhpParser\Node\FunctionLike; use PhpParser\Node\Param; -use PhpParser\Node\Stmt\ClassMethod; -use PhpParser\Node\Stmt\Function_; use Rector\Naming\Contract\RenameParamValueObjectInterface; final class ParamRename implements RenameParamValueObjectInterface @@ -19,7 +16,7 @@ public function __construct( private readonly string $expectedName, private readonly Param $param, private readonly Variable $variable, - private readonly ClassMethod | Function_ | Closure | ArrowFunction $functionLike + private readonly FunctionLike $functionLike ) { } @@ -33,7 +30,7 @@ public function getExpectedName(): string return $this->expectedName; } - public function getFunctionLike(): ClassMethod | Function_ | Closure | ArrowFunction + public function getFunctionLike(): FunctionLike { return $this->functionLike; } diff --git a/rules/Naming/ValueObjectFactory/ParamRenameFactory.php b/rules/Naming/ValueObjectFactory/ParamRenameFactory.php index 1edc3849a92..2052bf712b7 100644 --- a/rules/Naming/ValueObjectFactory/ParamRenameFactory.php +++ b/rules/Naming/ValueObjectFactory/ParamRenameFactory.php @@ -4,12 +4,9 @@ namespace Rector\Naming\ValueObjectFactory; -use PhpParser\Node\Expr\ArrowFunction; -use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\Error; +use PhpParser\Node\FunctionLike; use PhpParser\Node\Param; -use PhpParser\Node\Stmt\ClassMethod; -use PhpParser\Node\Stmt\Function_; use Rector\Naming\ValueObject\ParamRename; use Rector\NodeNameResolver\NodeNameResolver; @@ -21,7 +18,7 @@ public function __construct( } public function createFromResolvedExpectedName( - ClassMethod|Function_|ArrowFunction|Closure $functionLike, + FunctionLike $functionLike, Param $param, string $expectedName ): ?ParamRename { diff --git a/rules/Naming/VariableRenamer.php b/rules/Naming/VariableRenamer.php index 309961a8b7c..62c778b3253 100644 --- a/rules/Naming/VariableRenamer.php +++ b/rules/Naming/VariableRenamer.php @@ -5,14 +5,11 @@ namespace Rector\Naming; use PhpParser\Node; -use PhpParser\Node\Expr\ArrowFunction; use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\Variable; use PhpParser\Node\Param; use PhpParser\Node\Stmt; -use PhpParser\Node\Stmt\ClassMethod; -use PhpParser\Node\Stmt\Function_; use PhpParser\NodeTraverser; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; @@ -31,7 +28,7 @@ public function __construct( } public function renameVariableInFunctionLike( - ClassMethod | Function_ | Closure | ArrowFunction $functionLike, + Node\FunctionLike $functionLike, string $oldName, string $expectedName, ?Assign $assign = null