Remove MultipleClassFileToPsr4ClassesRector as only PSR4 rule, bit ri…

…sky and better handled with PHPStan + remove adding/removing files logic, use printer instead (#4117)
rectorphp · Jun 8, 2023 · 6c3eb86 · 6c3eb86
1 parent 18a2a0f
commit 6c3eb86
Show file tree

Hide file tree

Showing 57 changed files with 4 additions and 1,317 deletions.
diff --git a/.github/workflows/e2e.yaml b/.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 }}
 

diff --git a/config/set/psr-4.php b/config/set/psr-4.php
diff --git a/e2e/multiple-class-psr4/.gitignore b/e2e/multiple-class-psr4/.gitignore
diff --git a/e2e/multiple-class-psr4/composer.json b/e2e/multiple-class-psr4/composer.json
diff --git a/e2e/multiple-class-psr4/expected-output.diff b/e2e/multiple-class-psr4/expected-output.diff
diff --git a/e2e/multiple-class-psr4/rector.php b/e2e/multiple-class-psr4/rector.php
diff --git a/e2e/multiple-class-psr4/src/ClassMatchFileName.php b/e2e/multiple-class-psr4/src/ClassMatchFileName.php
diff --git a/e2e/multiple-class-psr4/src/ClassNoMatchFileName.php b/e2e/multiple-class-psr4/src/ClassNoMatchFileName.php
diff --git a/e2e/multiple-class-psr4/src/WithAnonymousClass.php b/e2e/multiple-class-psr4/src/WithAnonymousClass.php
diff --git a/e2e/removed-and-added-files-collector/.gitignore b/e2e/removed-and-added-files-collector/.gitignore
diff --git a/e2e/removed-and-added-files-collector/TestRector.php b/e2e/removed-and-added-files-collector/TestRector.php
diff --git a/e2e/removed-and-added-files-collector/composer.json b/e2e/removed-and-added-files-collector/composer.json
diff --git a/e2e/removed-and-added-files-collector/expected-output.diff b/e2e/removed-and-added-files-collector/expected-output.diff
diff --git a/e2e/removed-and-added-files-collector/rector.php b/e2e/removed-and-added-files-collector/rector.php
diff --git a/e2e/removed-and-added-files-collector/src/Test.php b/e2e/removed-and-added-files-collector/src/Test.php
diff --git a/packages/ChangesReporting/Output/ConsoleOutputFormatter.php b/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!';

diff --git a/packages/ChangesReporting/Output/JsonOutputFormatter.php b/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(),
             ],
         ];
 

diff --git a/packages/FileSystemRector/Contract/AddedFileInterface.php b/packages/FileSystemRector/Contract/AddedFileInterface.php
diff --git a/packages/FileSystemRector/Contract/FileWithNodesInterface.php b/packages/FileSystemRector/Contract/FileWithNodesInterface.php
diff --git a/packages/FileSystemRector/ValueObject/AddedFileWithContent.php b/packages/FileSystemRector/ValueObject/AddedFileWithContent.php
diff --git a/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php b/packages/FileSystemRector/ValueObject/AddedFileWithNodes.php