From dd9fdea89c8fd19c846bc6445d98e086a0eaed58 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 21 Jul 2023 03:58:54 +0700 Subject: [PATCH 1/3] [PostRector] Only check phpdocinfo on Stmt and Param on NameImportingPostRector @TomasVotruba @staabm this is to avoid unnecessary check phpdocinfo on Expr or Identifier. Ref https://github.com/rectorphp/rector/issues/8077 --- packages/PostRector/Rector/NameImportingPostRector.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 7a6473dc1ff..85f7aba2606 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -63,12 +63,14 @@ public function enterNode(Node $node): ?Node return $this->processNodeName($node, $file); } - if (SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES)) { + if (SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES) && ($node instanceof Node\Stmt || $node instanceof Node\Param)) { $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); $this->docBlockNameImporter->importNames($phpDocInfo->getPhpDocNode(), $node); + + return $node; } - return $node; + return null; } public function getRuleDefinition(): RuleDefinition From 98c9b34479d36be90f230a109634e16c2263300a Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Jul 2023 21:01:25 +0000 Subject: [PATCH 2/3] [ci-review] Rector Rectify --- packages/PostRector/Rector/NameImportingPostRector.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 85f7aba2606..1f31a77e6d7 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -4,6 +4,7 @@ namespace Rector\PostRector\Rector; +use PhpParser\Node\Param; use PhpParser\Node; use PhpParser\Node\Identifier; use PhpParser\Node\Name; @@ -63,7 +64,7 @@ public function enterNode(Node $node): ?Node return $this->processNodeName($node, $file); } - if (SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES) && ($node instanceof Node\Stmt || $node instanceof Node\Param)) { + if (SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES) && ($node instanceof Stmt || $node instanceof Param)) { $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); $this->docBlockNameImporter->importNames($phpDocInfo->getPhpDocNode(), $node); From a3dd8394ce462a8b92931bb5b470feada892f361 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 21 Jul 2023 04:03:19 +0700 Subject: [PATCH 3/3] flip check --- packages/PostRector/Rector/NameImportingPostRector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 1f31a77e6d7..77b48f0bc5a 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -64,7 +64,7 @@ public function enterNode(Node $node): ?Node return $this->processNodeName($node, $file); } - if (SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES) && ($node instanceof Stmt || $node instanceof Param)) { + if (($node instanceof Stmt || $node instanceof Param) && SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_DOC_BLOCK_NAMES)) { $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node); $this->docBlockNameImporter->importNames($phpDocInfo->getPhpDocNode(), $node);