Remove removed/added class logic, print nodes as needed with better n…

…ode printer

.github/workflows/e2e.yaml

@@ -31,8 +31,6 @@ jobs:
                     - 'e2e/parallel-reflection-resolver'
                     - 'e2e/applied-rule-removed-node'
                     - 'e2e/parallel with space'
-                    - 'e2e/removed-and-added-files-collector'
-                    - 'e2e/multiple-class-psr4'
 
         name: End to end test - ${{ matrix.directory }}
 

packages/ChangesReporting/Output/ConsoleOutputFormatter.php

@@ -39,7 +39,6 @@ public function report(ProcessResult $processResult, Configuration $configuratio
         }
 
         $this->reportErrors($processResult->getErrors());
-        $this->reportRemovedFilesAndNodes($processResult);
 
         if ($processResult->getErrors() !== []) {
             return;
@@ -125,19 +124,6 @@ private function reportErrors(array $errors): void
         }
     }
 
-    private function reportRemovedFilesAndNodes(ProcessResult $processResult): void
-    {
-        if ($processResult->getAddedFilesCount() !== 0) {
-            $message = sprintf('%d files were added', $processResult->getAddedFilesCount());
-            $this->rectorOutputStyle->note($message);
-        }
-
-        if ($processResult->getRemovedFilesCount() !== 0) {
-            $message = sprintf('%d files were removed', $processResult->getRemovedFilesCount());
-            $this->rectorOutputStyle->note($message);
-        }
-    }
-
     private function normalizePathsToRelativeWithLine(string $errorMessage): string
     {
         $regex = '#' . preg_quote(getcwd(), '#') . '/#';
@@ -147,7 +133,7 @@ private function normalizePathsToRelativeWithLine(string $errorMessage): string
 
     private function createSuccessMessage(ProcessResult $processResult, Configuration $configuration): string
     {
-        $changeCount = count($processResult->getFileDiffs()) + $processResult->getRemovedAndAddedFilesCount();
+        $changeCount = count($processResult->getFileDiffs());
 
         if ($changeCount === 0) {
             return 'Rector is done!';

packages/ChangesReporting/Output/JsonOutputFormatter.php

@@ -34,7 +34,6 @@ public function report(ProcessResult $processResult, Configuration $configuratio
         $errorsJson = [
             'totals' => [
                 'changed_files' => count($processResult->getFileDiffs()),
-                'removed_and_added_files_count' => $processResult->getRemovedAndAddedFilesCount(),
             ],
         ];
 

packages/Parallel/WorkerRunner.php

@@ -9,7 +9,6 @@
 use Nette\Utils\FileSystem;
 use Rector\Caching\Detector\ChangedFilesDetector;
 use Rector\Core\Application\ApplicationFileProcessor;
-use Rector\Core\Application\FileSystem\RemovedAndAddedFilesProcessor;
 use Rector\Core\Console\Style\RectorConsoleOutputStyle;
 use Rector\Core\Contract\Processor\FileProcessorInterface;
 use Rector\Core\Provider\CurrentFileProvider;
@@ -40,7 +39,6 @@ public function __construct(
         private readonly CurrentFileProvider $currentFileProvider,
         private readonly DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator,
         private readonly RectorConsoleOutputStyle $rectorConsoleOutputStyle,
-        private readonly RemovedAndAddedFilesProcessor $removedAndAddedFilesProcessor,
         private readonly ApplicationFileProcessor $applicationFileProcessor,
         private readonly ChangedFilesDetector $changedFilesDetector,
         private readonly array $fileProcessors = [],
@@ -108,8 +106,6 @@ public function run(Encoder $encoder, Decoder $decoder, Configuration $configura
                 }
             }
 
-            $this->removedAndAddedFilesProcessor->run($configuration);
-
             /**
              * this invokes all listeners listening $decoder->on(...) @see \Symplify\EasyParallel\Enum\ReactEvent::DATA
              */

packages/Testing/PHPUnit/AbstractRectorTestCase.php

@@ -24,12 +24,9 @@
 use Rector\Testing\Fixture\FixtureFileFinder;
 use Rector\Testing\Fixture\FixtureFileUpdater;
 use Rector\Testing\Fixture\FixtureSplitter;
-use Rector\Testing\PHPUnit\Behavior\MovingFilesTrait;
 
 abstract class AbstractRectorTestCase extends AbstractTestCase implements RectorTestInterface
 {
-    use MovingFilesTrait;
-
     protected RemovedAndAddedFilesCollector $removedAndAddedFilesCollector;
 
     protected static ?ContainerInterface $allRectorContainer = null;
@@ -161,11 +158,6 @@ private function doTestFileMatchesExpectedContent(
 
         $changedContent = $this->processFilePath($originalFilePath, $inputFileContents);
 
-        // file is removed, we cannot compare it
-        if ($this->removedAndAddedFilesCollector->isFileRemoved($originalFilePath)) {
-            return;
-        }
-
         $fixtureFilename = basename($fixtureFilePath);
         $failureMessage = sprintf('Failed on fixture file "%s"', $fixtureFilename);