[FileProcessor] Remove unnecessary FileDiffFactory::createTempFileDiff() take 2 (#6528)

Author: samsonasik

src/Application/FileProcessor.php

@@ -54,46 +54,46 @@ public function processFile(File $file, Configuration $configuration): FileProce
         $fileHasChanged = false;
         $filePath = $file->getFilePath();
 
-        // 2. change nodes with Rectors
-        $rectorWithLineChanges = null;
-
         do {
             $file->changeHasChanged(false);
 
+            // 1. change nodes with Rector Rules
             $newStmts = $this->rectorNodeTraverser->traverse($file->getNewStmts());
 
-            // apply post rectors
+            // 2. apply post rectors
             $postNewStmts = $this->postFileProcessor->traverse($newStmts, $file);
 
-            // this is needed for new tokens added in "afterTraverse()"
+            // 3. this is needed for new tokens added in "afterTraverse()"
             $file->changeNewStmts($postNewStmts);
 
-            // 3. print to file or string
+            // 4. print to file or string
             // important to detect if file has changed
             $this->printFile($file, $configuration, $filePath);
 
-            $fileHasChangedInCurrentPass = $file->hasChanged();
-
-            if ($fileHasChangedInCurrentPass) {
-                $file->setFileDiff($this->fileDiffFactory->createTempFileDiff($file));
-                $rectorWithLineChanges = $file->getRectorWithLineChanges();
-
-                $fileHasChanged = true;
+            // no change in current iteration, stop
+            if (! $file->hasChanged()) {
+                break;
             }
-        } while ($fileHasChangedInCurrentPass);
+
+            $fileHasChanged = true;
+        } while (true);
 
         // 5. add as cacheable if not changed at all
         if (! $fileHasChanged) {
             $this->changedFilesDetector->addCachableFile($filePath);
-        }
+        } else {
+            // when changed, set final status changed to true
+            // to ensure it make sense to verify in next process when needed
+            $file->changeHasChanged(true);
 
-        if ($configuration->shouldShowDiffs() && $rectorWithLineChanges !== null) {
             $currentFileDiff = $this->fileDiffFactory->createFileDiffWithLineChanges(
+                $configuration->shouldShowDiffs(),
                 $file,
                 $file->getOriginalFileContent(),
                 $file->getFileContent(),
-                $rectorWithLineChanges
+                $file->getRectorWithLineChanges()
             );
+
             $file->setFileDiff($currentFileDiff);
         }
 

src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php

@@ -24,6 +24,7 @@ public function __construct(
      * @param RectorWithLineChange[] $rectorsWithLineChanges
      */
     public function createFileDiffWithLineChanges(
+        bool $shouldShowDiffs,
         File $file,
         string $oldContent,
         string $newContent,
@@ -34,14 +35,9 @@ public function createFileDiffWithLineChanges(
         // always keep the most recent diff
         return new FileDiff(
             $relativeFilePath,
-            $this->defaultDiffer->diff($oldContent, $newContent),
-            $this->consoleDiffer->diff($oldContent, $newContent),
+            $shouldShowDiffs ? $this->defaultDiffer->diff($oldContent, $newContent) : '',
+            $shouldShowDiffs ? $this->consoleDiffer->diff($oldContent, $newContent) : '',
             $rectorsWithLineChanges
         );
     }
-
-    public function createTempFileDiff(File $file): FileDiff
-    {
-        return $this->createFileDiffWithLineChanges($file, '', '', $file->getRectorWithLineChanges());
-    }
 }

src/Differ/DefaultDiffer.php

@@ -22,10 +22,6 @@ public function __construct()
 
     public function diff(string $old, string $new): string
     {
-        if ($old === $new) {
-            return '';
-        }
-
         return $this->differ->diff($old, $new);
     }
 }