[Diffs] Handle --no-diffs usage to show file have been changed if any with --dry-run + --no-diffs

Author: samsonasik

src/Application/ApplicationFileProcessor.php

@@ -61,7 +61,7 @@ public function run(Configuration $configuration, InputInterface $input): Proces
 
         // no files found
         if ($filePaths === []) {
-            return new ProcessResult([], []);
+            return new ProcessResult([], [], 0);
         }
 
         $this->missConfigurationReporter->reportVendorInPaths($filePaths);
@@ -124,6 +124,7 @@ public function processFiles(
         /** @var FileDiff[] $fileDiffs */
         $fileDiffs = [];
 
+        $totalChanged = 0;
         foreach ($filePaths as $filePath) {
             if ($preFileCallback !== null) {
                 $preFileCallback($filePath);
@@ -148,6 +149,10 @@ public function processFiles(
                 if (is_callable($postFileCallback)) {
                     $postFileCallback(1);
                 }
+
+                if ($fileProcessResult->hasChanged()) {
+                    ++$totalChanged;
+                }
             } catch (Throwable $throwable) {
                 $this->changedFilesDetector->invalidateFile($filePath);
 
@@ -159,7 +164,7 @@ public function processFiles(
             }
         }
 
-        return new ProcessResult($systemErrors, $fileDiffs);
+        return new ProcessResult($systemErrors, $fileDiffs, $totalChanged);
     }
 
     private function processFile(File $file, Configuration $configuration): FileProcessResult

src/Application/FileProcessor.php

@@ -100,7 +100,7 @@ public function processFile(File $file, Configuration $configuration): FileProce
             $file->setFileDiff($currentFileDiff);
         }
 
-        return new FileProcessResult([], $file->getFileDiff());
+        return new FileProcessResult([], $file->getFileDiff(), $file->hasChanged());
     }
 
     private function parseFileAndDecorateNodes(File $file): ?SystemError

src/ChangesReporting/Output/ConsoleOutputFormatter.php

@@ -144,9 +144,9 @@ private function normalizePathsToRelativeWithLine(string $errorMessage): string
 
     private function createSuccessMessage(ProcessResult $processResult, Configuration $configuration): string
     {
-        $changeCount = count($processResult->getFileDiffs());
+        $changeCount = $processResult->getTotalChanged();
 
-        if ($changeCount === 0) {
+        if ($changeCount === 0 && ! $processResult->hasChanged()) {
             return 'Rector is done!';
         }
 

src/Console/Command/ProcessCommand.php

@@ -214,6 +214,10 @@ private function resolveReturnCode(ProcessResult $processResult, Configuration $
             return ExitCode::CHANGED_CODE;
         }
 
+        if ($processResult->hasChanged()) {
+            return ExitCode::CHANGED_CODE;
+        }
+
         return ExitCode::SUCCESS;
     }
 

src/Console/Command/WorkerCommand.php

@@ -158,6 +158,7 @@ private function runWorker(
                     Bridge::FILES_COUNT => count($filePaths),
                     Bridge::SYSTEM_ERRORS => $processResult->getSystemErrors(),
                     Bridge::SYSTEM_ERRORS_COUNT => count($processResult->getSystemErrors()),
+                    Bridge::HAS_CHANGED => $processResult->hasChanged(),
                 ],
             ]);
         });

src/Parallel/Application/ParallelFileProcessor.php

@@ -119,6 +119,7 @@ public function process(
 
         $systemErrorsCount = 0;
         $reachedSystemErrorsCountLimit = false;
+        $totalChanged = 0;
 
         $handleErrorCallable = function (Throwable $throwable) use (
             &$systemErrors,
@@ -158,7 +159,8 @@ public function process(
             $timeoutInSeconds,
             $handleErrorCallable,
             &$fileChunksBudgetPerProcess,
-            &$processSpawner
+            &$processSpawner,
+            &$totalChanged
         ): void {
             $processIdentifier = Random::generate();
             $workerCommandLine = $this->workerCommandLineFactory->create(
@@ -185,8 +187,14 @@ function (array $json) use (
                     &$reachedInternalErrorsCountLimit,
                     $processIdentifier,
                     &$fileChunksBudgetPerProcess,
-                    &$processSpawner
+                    &$processSpawner,
+                    &$totalChanged
                 ): void {
+
+                    if ($json[Bridge::HAS_CHANGED]) {
+                        ++$totalChanged;
+                    }
+
                     // decode arrays to objects
                     foreach ($json[Bridge::SYSTEM_ERRORS] as $jsonError) {
                         if (is_string($jsonError)) {
@@ -269,6 +277,6 @@ function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier): v
             ));
         }
 
-        return new ProcessResult($systemErrors, $fileDiffs);
+        return new ProcessResult($systemErrors, $fileDiffs, $totalChanged);
     }
 }

src/Parallel/ValueObject/Bridge.php

@@ -33,4 +33,9 @@ final class Bridge
      * @var string
      */
     public const FILES_COUNT = 'files_count';
+
+    /**
+     * @var string
+     */
+    public const HAS_CHANGED = 'has_changed';
 }

src/ValueObject/FileProcessResult.php

@@ -15,7 +15,8 @@
      */
     public function __construct(
         private array $systemErrors,
-        private ?FileDiff $fileDiff
+        private ?FileDiff $fileDiff,
+        private bool $hasChanged
     ) {
         Assert::allIsInstanceOf($systemErrors, SystemError::class);
     }
@@ -32,4 +33,9 @@ public function getFileDiff(): ?FileDiff
     {
         return $this->fileDiff;
     }
+
+    public function hasChanged(): bool
+    {
+        return $this->hasChanged;
+    }
 }

src/ValueObject/ProcessResult.php

@@ -17,6 +17,7 @@ final class ProcessResult
     public function __construct(
         private array $systemErrors,
         private readonly array $fileDiffs,
+        private readonly int $totalChanged
     ) {
         Assert::allIsInstanceOf($systemErrors, SystemError::class);
         Assert::allIsInstanceOf($fileDiffs, FileDiff::class);
@@ -51,4 +52,14 @@ public function addSystemErrors(array $systemErrors): void
 
         $this->systemErrors = [...$this->systemErrors, ...$systemErrors];
     }
+
+    public function hasChanged(): bool
+    {
+        return $this->totalChanged > 0;
+    }
+
+    public function getTotalChanged(): int
+    {
+        return $this->totalChanged;
+    }
 }

tests/ChangesReporting/Output/GitHubOutputFormatterTest.php

@@ -53,6 +53,7 @@ public function testReportShouldOutputErrorMessagesGrouped(): void
                         [new RectorWithLineChange(StrStartsWithRector::class, 38)]
                     ),
                 ],
+                1
             ),
             new Configuration()
         );
@@ -62,7 +63,7 @@ public function testReportShouldOutputErrorMessagesGroupedWithNoErrors(): void
     {
         $this->expectOsOutputString('::group::Rector report' . PHP_EOL . '::endgroup::' . PHP_EOL);
 
-        $this->gitHubOutputFormatter->report(new ProcessResult([], []), new Configuration());
+        $this->gitHubOutputFormatter->report(new ProcessResult([], [], 1), new Configuration());
     }
 
     public function testReportShouldOutputErrorMessagesGroupedWithMultipleDiffs(): void
@@ -95,7 +96,7 @@ public function testReportShouldOutputErrorMessagesGroupedWithMultipleDiffs(): v
                     'diff console formatted',
                     [new RectorWithLineChange(StrStartsWithRector::class, 54)]
                 ),
-            ], ),
+            ], 2),
             new Configuration()
         );
     }