[console] Normalize structured command output

Author: coisa

src/Console/Command/CodeStyleCommand.php

@@ -164,14 +164,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return $this->success('Code style checks completed successfully.', $input, [
                 'fix' => $fix,
                 'config' => self::CONFIG,
-                'process_output' => $processOutput instanceof BufferedOutput ? $processOutput->fetch() : null,
+                'output' => $processOutput,
             ]);
         }
 
         return $this->failure('Code style checks failed.', $input, [
             'fix' => $fix,
             'config' => self::CONFIG,
-            'process_output' => $processOutput instanceof BufferedOutput ? $processOutput->fetch() : null,
+            'output' => $processOutput,
         ]);
     }
 }

src/Console/Command/TestsCommand.php

@@ -366,7 +366,7 @@ private function resolveStructuredProcessResultPayload(OutputInterface $processO
             ];
         }
 
-        if (null !== $supplementalOutput) {
+        if (null !== $supplementalOutput && ! \is_array($decoded)) {
             $payload['raw_output'] = $supplementalOutput;
         }
 

tests/Console/Command/CodeStyleCommandTest.php

@@ -129,12 +129,10 @@ public function executeWillReturnSuccessWhenProcessQueueSucceeds(): void
         $this->logger->log(
             'info',
             'Code style checks completed successfully.',
-            [
-                'input' => $this->input->reveal(),
-                'fix' => false,
-                'config' => CodeStyleCommand::CONFIG,
-                'process_output' => null,
-            ],
+            Argument::that(fn(array $context): bool => $this->input->reveal() === $context['input']
+                && false === $context['fix']
+                && CodeStyleCommand::CONFIG === $context['config']
+                && $context['output'] instanceof OutputInterface),
         )->shouldBeCalled();
 
         self::assertSame(CodeStyleCommand::SUCCESS, $this->executeCommand());
@@ -155,14 +153,12 @@ public function executeWillReturnFailureWhenProcessQueueFails(): void
             ->shouldBeCalled();
         $this->logger->error(
             'Code style checks failed.',
-            [
-                'input' => $this->input->reveal(),
-                'file' => null,
-                'line' => null,
-                'fix' => false,
-                'config' => CodeStyleCommand::CONFIG,
-                'process_output' => null,
-            ],
+            Argument::that(fn(array $context): bool => $this->input->reveal() === $context['input']
+                && null === $context['file']
+                && null === $context['line']
+                && false === $context['fix']
+                && CodeStyleCommand::CONFIG === $context['config']
+                && $context['output'] instanceof OutputInterface),
         )->shouldBeCalled();
 
         self::assertSame(CodeStyleCommand::FAILURE, $this->executeCommand());
@@ -190,7 +186,7 @@ public function executeWillCaptureBufferedOutputWhenJsonIsRequested(): void
             'info',
             'Code style checks completed successfully.',
             Argument::that(fn(array $context): bool => $this->input->reveal() === $context['input']
-                && \is_string($context['process_output'])),
+                && $context['output'] instanceof OutputInterface),
         )->shouldBeCalled();
 
         self::assertSame(CodeStyleCommand::SUCCESS, $this->executeCommand());

tests/Console/Command/TestsCommandTest.php

@@ -439,7 +439,7 @@ public function executeWillCaptureStructuredPhpUnitSummaryAfterCoveragePreludeWh
                 && isset($context['output'])
                 && 'success' === $context['output']['result']
                 && 5 === $context['output']['summary']['assertions']
-                && 'Generating code coverage report in PHP format ... done [00:00.002]' === $context['output']['raw_output']),
+                && ! isset($context['output']['raw_output'])),
         )->shouldBeCalled();
         $this->output->writeln(Argument::cetera())->shouldNotBeCalled();
 

tests/Console/Logger/Processor/CommandOutputProcessorTest.php

@@ -190,6 +190,33 @@ public function processWillDiscardPlainTextPreambleBeforeStructuredJsonOutput():
         ], $context['output']);
     }
 
+    /**
+     * @return void
+     */
+    #[Test]
+    public function processWillDecodeTheFinalStructuredJsonAfterPlainTextToolOutput(): void
+    {
+        $processor = new CommandOutputProcessor();
+        $output = new BufferedOutput();
+        $output->write(
+            "composer-normalize warning before machine output.\n"
+            . "Another advisory line.\n"
+            . "{\"totals\":{\"changed_files\":0,\"errors\":0},\"changed_files\":[\"src/Foo.php\"]}\n"
+        );
+
+        $context = $processor->process([
+            'output' => $output,
+        ]);
+
+        self::assertSame([
+            'totals' => [
+                'changed_files' => 0,
+                'errors' => 0,
+            ],
+            'changed_files' => [],
+        ], $context['output']);
+    }
+
     /**
      * @return void
      */