From 68a3133bbb3b5177b2209aacf35314ecc4fe48dc Mon Sep 17 00:00:00 2001
From: SychO9 <sychocouldy@gmail.com>
Date: Thu, 30 Sep 2021 21:44:27 +0100
Subject: [PATCH] Prepend input to composer output log (Fixes #7)

---
 .../src/Command/CheckForUpdatesHandler.php                | 2 +-
 .../package-manager/src/Command/GlobalUpdateHandler.php   | 2 +-
 .../src/Command/MinorFlarumUpdateHandler.php              | 2 +-
 .../src/Command/RemoveExtensionHandler.php                | 2 +-
 .../src/Command/RequireExtensionHandler.php               | 2 +-
 .../src/Command/UpdateExtensionHandler.php                | 2 +-
 extensions/package-manager/src/OutputLogger.php           | 8 +++++---
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php
index a4cd34a54..a1908383e 100755
--- a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php
+++ b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php
@@ -59,7 +59,7 @@ class CheckForUpdatesHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerCommandFailedException('', $output);
diff --git a/extensions/package-manager/src/Command/GlobalUpdateHandler.php b/extensions/package-manager/src/Command/GlobalUpdateHandler.php
index 5e644a8b5..e7e5bfd92 100644
--- a/extensions/package-manager/src/Command/GlobalUpdateHandler.php
+++ b/extensions/package-manager/src/Command/GlobalUpdateHandler.php
@@ -64,7 +64,7 @@ class GlobalUpdateHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerUpdateFailedException('*', $output);
diff --git a/extensions/package-manager/src/Command/MinorFlarumUpdateHandler.php b/extensions/package-manager/src/Command/MinorFlarumUpdateHandler.php
index 858dee4b1..18ae1f7bf 100755
--- a/extensions/package-manager/src/Command/MinorFlarumUpdateHandler.php
+++ b/extensions/package-manager/src/Command/MinorFlarumUpdateHandler.php
@@ -66,7 +66,7 @@ class MinorFlarumUpdateHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerUpdateFailedException('flarum/*', $output);
diff --git a/extensions/package-manager/src/Command/RemoveExtensionHandler.php b/extensions/package-manager/src/Command/RemoveExtensionHandler.php
index ef76c84c8..3895e2bf0 100755
--- a/extensions/package-manager/src/Command/RemoveExtensionHandler.php
+++ b/extensions/package-manager/src/Command/RemoveExtensionHandler.php
@@ -70,7 +70,7 @@ class RemoveExtensionHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerCommandFailedException($extension->name, $output);
diff --git a/extensions/package-manager/src/Command/RequireExtensionHandler.php b/extensions/package-manager/src/Command/RequireExtensionHandler.php
index 216f0c712..70d1c1505 100755
--- a/extensions/package-manager/src/Command/RequireExtensionHandler.php
+++ b/extensions/package-manager/src/Command/RequireExtensionHandler.php
@@ -80,7 +80,7 @@ class RequireExtensionHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerRequireFailedException($command->package, $output);
diff --git a/extensions/package-manager/src/Command/UpdateExtensionHandler.php b/extensions/package-manager/src/Command/UpdateExtensionHandler.php
index 0e99e34c1..c0c0c4e31 100755
--- a/extensions/package-manager/src/Command/UpdateExtensionHandler.php
+++ b/extensions/package-manager/src/Command/UpdateExtensionHandler.php
@@ -92,7 +92,7 @@ class UpdateExtensionHandler
         $exitCode = $this->composer->run($input, $output);
         $output = $output->fetch();
 
-        $this->logger->log($output, $exitCode);
+        $this->logger->log($input->__toString(), $output, $exitCode);
 
         if ($exitCode !== 0) {
             throw new ComposerUpdateFailedException($extension->name, $output);
diff --git a/extensions/package-manager/src/OutputLogger.php b/extensions/package-manager/src/OutputLogger.php
index 1af49467b..9041f8769 100644
--- a/extensions/package-manager/src/OutputLogger.php
+++ b/extensions/package-manager/src/OutputLogger.php
@@ -16,12 +16,14 @@ class OutputLogger
         $this->logger = $logger;
     }
 
-    public function log(string $output, int $exitCode): void
+    public function log(string $input, string $output, int $exitCode): void
     {
+        $content = "$input\n$output";
+
         if ($exitCode === 0) {
-            $this->logger->info($output);
+            $this->logger->info($content);
         } else {
-            $this->logger->error($output);
+            $this->logger->error($content);
         }
     }
 }