Reduce conditional code in InstallationRunner

Author: acelaya

src/Service/InstallationRunner.php

@@ -25,14 +25,29 @@ public function __construct(
     /** @inheritDoc */
     public function runInstallation(Command|null $initCommand, SymfonyStyle $io): int
     {
-        return $this->run($initCommand, $io, isUpdate: false, importedConfig: ImportedConfig::notImported());
+        $initCommandInput = [InitOption::INITIAL_API_KEY->asCliFlag() => null];
+        return $this->run($initCommand, $io, $initCommandInput, ImportedConfig::notImported());
     }
 
     /** @inheritDoc */
     public function runUpdate(Command|null $initCommand, SymfonyStyle $io): int
     {
         $importConfig = $this->assetsHandler->resolvePreviousConfig($io);
-        return $this->run($initCommand, $io, isUpdate: true, importedConfig: $importConfig);
+
+        // Check if a cached config file exists and drop it if so
+        $this->assetsHandler->dropCachedConfigIfAny($io);
+        $this->assetsHandler->importShlinkAssetsFromPath($io, $importConfig->importPath);
+
+        $initCommandInput = [
+            InitOption::SKIP_INITIALIZE_DB->asCliFlag() => null,
+            InitOption::CLEAR_DB_CACHE->asCliFlag() => null,
+        ];
+
+        if ($this->assetsHandler->roadRunnerBinaryExistsInPath($importConfig->importPath)) {
+            $initCommandInput[InitOption::DOWNLOAD_RR_BINARY->asCliFlag()] = null;
+        }
+
+        return $this->run($initCommand, $io, $initCommandInput, $importConfig);
     }
 
     /**
@@ -41,20 +56,14 @@ public function runUpdate(Command|null $initCommand, SymfonyStyle $io): int
     private function run(
         Command|null $initCommand,
         SymfonyStyle $io,
-        bool $isUpdate,
+        array $initCommandInput,
         ImportedConfig $importedConfig,
     ): int {
         $io->text([
             '<info>Welcome to Shlink!!</info>',
             'This tool will guide you through the installation process.',
         ]);
 
-        // Check if a cached config file exists and drop it if so
-        $this->assetsHandler->dropCachedConfigIfAny($io);
-
-        if ($isUpdate) {
-            $this->assetsHandler->importShlinkAssetsFromPath($io, $importedConfig->importPath);
-        }
         $config = $this->configGenerator->generateConfigInteractively($io, $importedConfig->importedConfig);
         $normalizedConfig = Utils::normalizeAndKeepEnvVarKeys($config);
 
@@ -63,31 +72,12 @@ private function run(
         $io->text('<info>Custom configuration properly generated!</info>');
         $io->newLine();
 
-        if (! $this->execInitCommand($initCommand, $io, $isUpdate, $importedConfig)) {
+        $initCommandResult = $initCommand?->run(new ArrayInput($initCommandInput), $io);
+        if ($initCommandResult !== Command::SUCCESS) {
             return Command::FAILURE;
         }
 
         $io->success('Installation complete!');
         return Command::SUCCESS;
     }
-
-    private function execInitCommand(
-        Command|null $initCommand,
-        SymfonyStyle $io,
-        bool $isUpdate,
-        ImportedConfig $importedConfig,
-    ): bool {
-        $input = [
-            InitOption::SKIP_INITIALIZE_DB->asCliFlag() => $isUpdate,
-            InitOption::CLEAR_DB_CACHE->asCliFlag() => $isUpdate,
-            InitOption::DOWNLOAD_RR_BINARY->asCliFlag() =>
-                $isUpdate && $this->assetsHandler->roadRunnerBinaryExistsInPath($importedConfig->importPath),
-        ];
-
-        if (! $isUpdate) {
-            $input[InitOption::INITIAL_API_KEY->asCliFlag()] = null;
-        }
-
-        return $initCommand?->run(new ArrayInput($input), $io) === Command::SUCCESS;
-    }
 }

test/Service/InstallationRunnerTest.php

@@ -28,10 +28,7 @@ class InstallationRunnerTest extends TestCase
     protected function setUp(): void
     {
         $this->initCommand = $this->createMock(Command::class);
-
         $this->assetsHandler = $this->createMock(ShlinkAssetsHandlerInterface::class);
-        $this->assetsHandler->expects($this->once())->method('dropCachedConfigIfAny');
-
         $this->configWriter = $this->createMock(ConfigWriterInterface::class);
 
         $configGenerator = $this->createStub(ConfigGeneratorInterface::class);
@@ -45,16 +42,13 @@ public function installationIsExecutedAsExpected(): void
     {
         $this->initCommand->expects($this->once())->method('run')->with(
             $this->callback(function (ArrayInput $input) {
-
-                Assert::assertEquals(
-                    '--skip-initialize-db --clear-db-cache --download-rr-binary --initial-api-key',
-                    $input->__toString(),
-                );
+                Assert::assertEquals('--initial-api-key', $input->__toString());
                 return true;
             }),
             $this->anything(),
         )->willReturn(Command::SUCCESS);
 
+        $this->assetsHandler->expects($this->never())->method('dropCachedConfigIfAny');
         $this->assetsHandler->expects($this->never())->method('resolvePreviousConfig');
         $this->assetsHandler->expects($this->never())->method('roadRunnerBinaryExistsInPath');
         $this->assetsHandler->expects($this->never())->method('importShlinkAssetsFromPath');
@@ -75,6 +69,7 @@ public function updateIsExecutedAsExpected(bool $rrBinExists, string $postUpdate
             $this->anything(),
         )->willReturn(0);
 
+        $this->assetsHandler->expects($this->once())->method('dropCachedConfigIfAny');
         $this->assetsHandler->expects($this->once())->method('resolvePreviousConfig')->willReturn(
             ImportedConfig::notImported(),
         );
@@ -90,11 +85,11 @@ public static function provideCommands(): iterable
     {
         yield 'update with no rr binary' => [
             false,
-            '--skip-initialize-db=1 --clear-db-cache=1 --download-rr-binary',
+            '--skip-initialize-db --clear-db-cache',
         ];
         yield 'update with rr binary' => [
             true,
-            '--skip-initialize-db=1 --clear-db-cache=1 --download-rr-binary=1',
+            '--skip-initialize-db --clear-db-cache --download-rr-binary',
         ];
     }
 }