[console] Normalize Rector changed file lists

Author: coisa

src/Console/Logger/Processor/CommandOutputProcessor.php

@@ -98,7 +98,7 @@ private function decodeStructuredOutput(string $content): mixed
         }
 
         try {
-            return json_decode($trimmedContent, true);
+            return $this->normalizeStructuredPayload(json_decode($trimmedContent, true));
         } catch (JsonException) {
         }
 
@@ -140,7 +140,7 @@ private function decodeJsonDocumentStream(string $content): ?array
             }
 
             try {
-                $decodedDocuments[] = json_decode($document, true);
+                $decodedDocuments[] = $this->normalizeStructuredPayload(json_decode($document, true));
             } catch (JsonException) {
                 return null;
             }
@@ -219,4 +219,52 @@ private function consumeJsonDocument(string $content, int &$offset): ?string
 
         return null;
     }
+
+    /**
+     * Normalizes decoded structured payloads produced by wrapped tooling.
+     *
+     * @param mixed $payload the decoded payload
+     *
+     * @return mixed the normalized payload
+     */
+    private function normalizeStructuredPayload(mixed $payload): mixed
+    {
+        if (! \is_array($payload)) {
+            return $payload;
+        }
+
+        if (! isset($payload['totals']) || ! \is_array($payload['totals'])) {
+            return $payload;
+        }
+
+        $changedFilesTotal = $payload['totals']['changed_files'] ?? null;
+
+        if (! \is_int($changedFilesTotal)) {
+            return $payload;
+        }
+
+        if (0 === $changedFilesTotal) {
+            $payload['changed_files'] = [];
+
+            return $payload;
+        }
+
+        if (! isset($payload['file_diffs']) || ! \is_array($payload['file_diffs'])) {
+            return $payload;
+        }
+
+        $changedFiles = [];
+
+        foreach ($payload['file_diffs'] as $fileDiff) {
+            if (! \is_array($fileDiff) || ! isset($fileDiff['file']) || ! \is_string($fileDiff['file'])) {
+                continue;
+            }
+
+            $changedFiles[$fileDiff['file']] = $fileDiff['file'];
+        }
+
+        $payload['changed_files'] = array_values($changedFiles);
+
+        return $payload;
+    }
 }

tests/Console/Logger/Processor/CommandOutputProcessorTest.php

@@ -71,6 +71,62 @@ public function processWillDecodeSingleJsonBufferedOutput(): void
         ], $context['output']);
     }
 
+    /**
+     * @return void
+     */
+    #[Test]
+    public function processWillNormalizeRectorChangedFilesWhenNoFilesActuallyChanged(): void
+    {
+        $processor = new CommandOutputProcessor();
+        $output = new BufferedOutput();
+        $output->write(
+            "{\"totals\":{\"changed_files\":0,\"errors\":0},\"changed_files\":[\"src/Foo.php\",\"src/Bar.php\"]}\n"
+        );
+
+        $context = $processor->process([
+            'output' => $output,
+        ]);
+
+        self::assertSame([
+            'totals' => [
+                'changed_files' => 0,
+                'errors' => 0,
+            ],
+            'changed_files' => [],
+        ], $context['output']);
+    }
+
+    /**
+     * @return void
+     */
+    #[Test]
+    public function processWillNormalizeRectorChangedFilesUsingOnlyDiffEntries(): void
+    {
+        $processor = new CommandOutputProcessor();
+        $output = new BufferedOutput();
+        $output->write(
+            "{\"totals\":{\"changed_files\":1,\"errors\":0},\"changed_files\":[\"src/Foo.php\",\"src/Bar.php\"],\"file_diffs\":[{\"file\":\"src/Bar.php\",\"diff\":\"@@\"}]}\n"
+        );
+
+        $context = $processor->process([
+            'output' => $output,
+        ]);
+
+        self::assertSame([
+            'totals' => [
+                'changed_files' => 1,
+                'errors' => 0,
+            ],
+            'changed_files' => ['src/Bar.php'],
+            'file_diffs' => [
+                [
+                    'file' => 'src/Bar.php',
+                    'diff' => '@@',
+                ],
+            ],
+        ], $context['output']);
+    }
+
     /**
      * @return void
      */