[DeadCode] Remove property comment same line on RemoveUnusedPrivatePr…

…opertyRector (#3547)

Co-authored-by: Markus Staab <markus.staab@redaxo.de>
Co-authored-by: GitHub Action <actions@github.com>

rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/Fixture/remove_same_line_comment_property.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector\Fixture;
+
+final class RemoveSamelineCommentProperty
+{
+
+    protected $_distributoradaids = [];
+
+    private $_max_fileage = 3600;// 1h
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector\Fixture;
+
+final class RemoveSamelineCommentProperty
+{
+
+    protected $_distributoradaids = [];
+}
+
+?>

rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\Nop;
 use PhpParser\Node\Stmt\Property;
 use Rector\Core\Contract\Rector\AllowEmptyConfigurableRectorInterface;
 use Rector\Core\NodeManipulator\PropertyManipulator;
@@ -86,7 +87,11 @@ public function refactor(Node $node): ?Node
     {
         $hasRemoved = false;
 
-        foreach ($node->getProperties() as $property) {
+        foreach ($node->stmts as $key => $property) {
+            if (! $property instanceof Property) {
+                continue;
+            }
+
             if ($this->shouldSkipProperty($property)) {
                 continue;
             }
@@ -104,13 +109,31 @@ public function refactor(Node $node): ?Node
             );
 
             if ($isRemoved) {
+                $this->processRemoveSameLineComment($node, $property, $key);
                 $hasRemoved = true;
             }
         }
 
         return $hasRemoved ? $node : null;
     }
 
+    private function processRemoveSameLineComment(Class_ $class, Property $property, int $key): void
+    {
+        if (!isset($class->stmts[$key + 1])) {
+            return;
+        }
+
+        if (!$class->stmts[$key + 1] instanceof Nop) {
+            return;
+        }
+
+        if ($class->stmts[$key + 1]->getEndLine() !== $property->getStartLine()) {
+            return;
+        }
+
+        unset($class->stmts[$key + 1]);
+    }
+
     private function shouldSkipProperty(Property $property): bool
     {
         if (count($property->props) !== 1) {