From 54c862e197151d0a1a3514544b2c63cc0fee009b Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 11 Sep 2023 15:15:02 +0200 Subject: [PATCH 1/3] Deprecated PhpDocInfo::markAsChanged() to ensure doc block is changed directly in the Rector rule --- packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php index 9c2a4c25086..6dc4e6f90fd 100644 --- a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php +++ b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php @@ -373,6 +373,7 @@ public function getTemplateTagValueNodes(): array } /** + * @deprecated Change doc block and print directly in the node instead * @internal * Should be handled by attributes of phpdoc node - if stard_and_end is missing in one of nodes, it has been changed * Similar to missing original node in php-aprser From af579aaddcd720512fb45337e0794a50b28b280d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 11 Sep 2023 16:26:31 +0200 Subject: [PATCH 2/3] remove unused markAsChanged() call --- packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php index 6dc4e6f90fd..b9c2cf57d27 100644 --- a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php +++ b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php @@ -79,8 +79,6 @@ public function addPhpDocTagNode(PhpDocChildNode $phpDocChildNode): void $this->phpDocNode->children[] = $phpDocChildNode; // to give node more space $this->makeMultiLined(); - - $this->markAsChanged(); } public function getPhpDocNode(): PhpDocNode From 4376fc5e5de3e7624257fc126faf5fc917b6ec32 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 11 Sep 2023 16:31:55 +0200 Subject: [PATCH 3/3] remove double moveCommentsFromAttributeObjectToCommentsAttribute() run --- src/PhpParser/Printer/BetterStandardPrinter.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/PhpParser/Printer/BetterStandardPrinter.php b/src/PhpParser/Printer/BetterStandardPrinter.php index 4ff725714b3..ed725b13626 100644 --- a/src/PhpParser/Printer/BetterStandardPrinter.php +++ b/src/PhpParser/Printer/BetterStandardPrinter.php @@ -360,16 +360,6 @@ protected function pScalar_String(String_ $string): string return parent::pScalar_String($string); } - /** - * @param Node[] $nodes - */ - protected function pStmts(array $nodes, bool $indent = true): string - { - $this->moveCommentsFromAttributeObjectToCommentsAttribute($nodes); - - return parent::pStmts($nodes, $indent); - } - /** * "...$params) : ReturnType" * ↓