From 79bed83164d4f4ead2adb0748f7d4fc54710a8d7 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 24 Dec 2025 07:37:17 +0700 Subject: [PATCH 1/3] chore: Prepare to update to rector 2.3.0 and migrate FileWithoutNamespace to FileNode --- composer.json | 2 +- .../Rector/UnderscoreToCamelCaseVariableNameRector.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 48007df18b3d..7ee9c0a858ee 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "phpunit/phpcov": "^9.0.2 || ^10.0", "phpunit/phpunit": "^10.5.16 || ^11.2", "predis/predis": "^3.0", - "rector/rector": "2.2.14", + "rector/rector": "dev-main", "shipmonk/phpstan-baseline-per-identifier": "^2.0" }, "replace": { diff --git a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php index 4471bdb7167c..42c677a2de84 100644 --- a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -23,7 +23,7 @@ use PhpParser\Node\Stmt\Namespace_; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Php\ReservedKeywordAnalyzer; -use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace; +use Rector\PhpParser\Node\FileNode; use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -77,14 +77,18 @@ public function run($aB) */ public function getNodeTypes(): array { - return [FileWithoutNamespace::class, Namespace_::class]; + return [FileNode::class, Namespace_::class]; } /** - * @param ClassMethod|Closure|FileWithoutNamespace|Function_|Namespace_ $node + * @param ClassMethod|Closure|FileNode|Function_|Namespace_ $node */ public function refactor(Node $node): ?Node { + if ($node instanceof FileNode && $node->isNamespaced()) { + return null; + } + if ($node->stmts === null) { return null; } From 359c5aee80f4e3e4e6ff0a3c06378a781ea4fb8e Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 24 Dec 2025 07:38:44 +0700 Subject: [PATCH 2/3] chore: add comment for namespaced filenode --- utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php index 42c677a2de84..8bf02002a267 100644 --- a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -86,6 +86,7 @@ public function getNodeTypes(): array public function refactor(Node $node): ?Node { if ($node instanceof FileNode && $node->isNamespaced()) { + // handled in Namespace_ node return null; } From 83bef105a7da5c86e7006b5d09d4365e0a931a62 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 24 Dec 2025 07:43:02 +0700 Subject: [PATCH 3/3] chore: clean up param doc --- utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php index 8bf02002a267..070522314ee3 100644 --- a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -81,7 +81,7 @@ public function getNodeTypes(): array } /** - * @param ClassMethod|Closure|FileNode|Function_|Namespace_ $node + * @param FileNode|Namespace_ $node */ public function refactor(Node $node): ?Node {