[Php80][CodingStyle] Handle ClassPropertyAssignToConstructorPromotionRector+NewlineAfterStatementRector

rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php

@@ -111,6 +111,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($this->nodesToRemoveCollector->isActive()) {
+            return null;
+        }
+
         $node = $this->resolveCurrentStatement($node);
 
         if (! in_array($node::class, self::STMTS_TO_HAVE_NEXT_NEWLINE, true)) {

tests/Issues/Issue6840/ClassPropertyPromotionAndNewLineAfterStatementRectorTest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\Issue6840;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+/**
+ * @see https://github.com/rectorphp/rector/issues/6840
+ */
+final class ClassPropertyPromotionAndNewLineAfterStatementRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

tests/Issues/Issue6840/Fixture/fixture.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\Issue6840\Fixture;
+
+class Fixture
+{
+    protected string $imageId;
+    protected array $imageSize;
+
+    public function __construct($imageId)
+    {
+        $this->imageId = $imageId;
+        $this->imageSize = [];
+    }
+}
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\Issues\Issue6840\Fixture;
+
+class Fixture
+{
+    protected array $imageSize;
+
+    public function __construct(protected $imageId)
+    {
+        $this->imageSize = [];
+    }
+}
+?>

tests/Issues/Issue6840/config/configured_rule.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(ClassPropertyAssignToConstructorPromotionRector::class);
+    $services->set(NewlineAfterStatementRector::class);
+};