diff --git a/composer.json b/composer.json index 48007df18b3d..c1254bf5f583 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": "2.3.0", "shipmonk/phpstan-baseline-per-identifier": "^2.0" }, "replace": { diff --git a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php index 4471bdb7167c..070522314ee3 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,19 @@ 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 FileNode|Namespace_ $node */ public function refactor(Node $node): ?Node { + if ($node instanceof FileNode && $node->isNamespaced()) { + // handled in Namespace_ node + return null; + } + if ($node->stmts === null) { return null; }