meh

SonsOfPHP · Oct 20, 2024 · 423a533 · 423a533
1 parent c4cb422
commit 423a533
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 80 deletions.
diff --git a/src/SonsOfPHP/Bard/src/Console/Command/AbstractCommand.php b/src/SonsOfPHP/Bard/src/Console/Command/AbstractCommand.php
@@ -5,6 +5,7 @@
 namespace SonsOfPHP\Bard\Console\Command;
 
 use SonsOfPHP\Bard\JsonFile;
+use SonsOfPHP\Bard\JsonFileInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\ProcessHelper;
@@ -17,18 +18,33 @@
  */
 abstract class AbstractCommand extends Command
 {
-    protected JsonFile $bardConfig;
+    protected JsonFileInterface $bardConfig;
 
     protected SymfonyStyle $bardStyle;
 
     protected function initialize(InputInterface $input, OutputInterface $output): void
     {
-        $this->bardConfig = new JsonFile($input->getOption('working-dir') . '/bard.json');
-        $config = $input->getOption('config');
+        $this->initializeBardStyle($input, $output);
+        $this->initializeBardConfig($input, $output);
+    }
+
+    private function initializeBardConfig(InputInterface $input, OutputInterface $output): void
+    {
+        $bardJson = $input->getOption('working-dir') . '/bard.json';
+        $config   = $input->getOption('config');
         if ('bard.json' !== $config) {
-            $this->bardConfig = new JsonFile($config);
+            $bardJson = $config;
+        }
+
+        if ($output->isDebug()) {
+            $this->bardStyle->text(sprintf('Using configuration file "%s"', $bardJson));
         }
 
+        $this->bardConfig = new JsonFile($bardJson);
+    }
+
+    private function initializeBardStyle(InputInterface $input, OutputInterface $output): void
+    {
         $this->bardStyle = new SymfonyStyle($input, $output);
     }
 

diff --git a/src/SonsOfPHP/Bard/src/Console/Command/MergeCommand.php b/src/SonsOfPHP/Bard/src/Console/Command/MergeCommand.php
@@ -30,8 +30,6 @@
  */
 final class MergeCommand extends AbstractCommand
 {
-    protected JsonFile $bardConfig;
-
     private string $mainComposerFile;
 
     protected function configure(): void
@@ -46,12 +44,7 @@ protected function configure(): void
 
     protected function initialize(InputInterface $input, OutputInterface $output): void
     {
-        $bardConfigFile = $input->getOption('working-dir') . '/bard.json';
-        if (!file_exists($bardConfigFile)) {
-            throw new RuntimeException(sprintf('"%s" file does not exist', $bardConfigFile));
-        }
-
-        $this->bardConfig = new JsonFile($bardConfigFile);
+        parent::initialize($input, $output);
 
         $this->mainComposerFile = $input->getOption('working-dir') . '/composer.json';
         if (!file_exists($this->mainComposerFile)) {
@@ -67,12 +60,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $rootComposerJsonFile = new JsonFile($input->getOption('working-dir') . '/composer.json');
 
         // Clean out a few of the sections in root composer.json file
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('autoload'));
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('autoload-dev'));
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('require'));
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('require-dev'));
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('replace'));
-        $rootComposerJsonFile = $rootComposerJsonFile->with(new ClearSectionOperation('provide'));
+        $rootComposerJsonFile = $rootComposerJsonFile
+            ->with(new ClearSectionOperation('autoload'))
+            ->with(new ClearSectionOperation('autoload-dev'))
+            ->with(new ClearSectionOperation('require'))
+            ->with(new ClearSectionOperation('require-dev'))
+            ->with(new ClearSectionOperation('replace'))
+            ->with(new ClearSectionOperation('provide'))
+        ;
 
         foreach ($this->bardConfig->getSection('packages') as $pkg) {
             $pkgComposerFile = realpath($input->getOption('working-dir') . '/' . $pkg['path'] . '/composer.json');
@@ -87,7 +82,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 continue;
             }
 
-            $output->writeln($this->getFormatterHelper()->formatSection('bard', sprintf('Merging "%s" into root composer.json', $pkgComposerJsonFile->getSection('name'))));
+            $this->bardStyle->text(sprintf(
+                'Merging "%s" into root composer.json',
+                $pkgComposerJsonFile->getSection('name'),
+            ));
 
             // Update root composer.json
             $rootComposerJsonFile = $rootComposerJsonFile