Factorize code

Author: mnapoli

src/Commands/ApplicationCommand.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+namespace Bref\Cli\Commands;
+
+use Bref\Cli\Config;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+class ApplicationCommand extends Command
+{
+    protected function configure(): void
+    {
+        $this
+            ->addOption('env', 'e', InputOption::VALUE_REQUIRED, 'The environment', 'dev')
+            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'The location of the configuration file to use')
+            ->addOption('team', null, InputOption::VALUE_REQUIRED, 'Override the team');
+    }
+
+    /**
+     * @return array{
+     *     appName: string,
+     *     environmentName: string,
+     *     team: string,
+     *     config: array{name: string, team: string, type: string},
+     * }
+     */
+    protected function parseStandardOptions(InputInterface $input): array
+    {
+        /** @var string $environment */
+        $environment = $input->getOption('env');
+        /** @var string|null $configFileName */
+        $configFileName = $input->getOption('config');
+        $config = Config::loadConfig($configFileName, $environment, $input->getOption('team'));
+
+        return [
+            'appName' => $config['name'],
+            'config' => $config,
+            'environmentName' => $environment,
+            'team' => $config['team'],
+        ];
+    }
+}

src/Commands/Deploy.php

@@ -9,9 +9,7 @@
 use Bref\Cli\Cli\IO;
 use Bref\Cli\Cli\Styles;
 use Bref\Cli\Components\ServerlessFramework;
-use Bref\Cli\Config;
 use Exception;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -22,7 +20,7 @@
 use function Amp\ByteStream\buffer;
 use function Amp\delay;
 
-class Deploy extends Command
+class Deploy extends ApplicationCommand
 {
     protected function configure(): void
     {
@@ -31,27 +29,21 @@ protected function configure(): void
         $this
             ->setName('deploy')
             ->setDescription('Deploy the application')
-            ->addOption('env', 'e', InputOption::VALUE_REQUIRED, 'The environment to deploy to', 'dev')
-            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'The location of the configuration file to use')
-            ->addOption('team', null, InputOption::VALUE_REQUIRED, 'Override the team to deploy to')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Force the deployment');
+        parent::configure();
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         IO::writeln([Styles::brefHeader(), '']);
 
-        $brefCloud = new BrefCloudClient;
-
-        /** @var string $environment */
-        $environment = $input->getOption('env');
-
-        /** @var string|null $configFileName */
-        $configFileName = $input->getOption('config');
+        [
+            'appName' => $appName,
+            'environmentName' => $environment,
+            'config' => $config,
+        ] = $this->parseStandardOptions($input);
 
-        $config = Config::loadConfig($configFileName, $environment, $input->getOption('team'));
-
-        $appName = $config['name'];
+        $brefCloud = new BrefCloudClient;
 
         IO::writeln([
             sprintf("Deploying %s to environment %s", Styles::bold($appName), Styles::bold($environment)),

src/Commands/Info.php

@@ -2,53 +2,37 @@
 
 namespace Bref\Cli\Commands;
 
-use Amp\ByteStream\BufferException;
-use Amp\Process\Process;
-use Amp\Process\ProcessException;
 use Bref\Cli\BrefCloudClient;
 use Bref\Cli\Cli\IO;
 use Bref\Cli\Cli\Styles;
-use Bref\Cli\Components\ServerlessFramework;
-use Bref\Cli\Config;
-use Exception;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\HttpClient\HttpClient;
-use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
-use ZipArchive;
-use function Amp\ByteStream\buffer;
-use function Amp\delay;
 
-class Info extends Command
+class Info extends ApplicationCommand
 {
     protected function configure(): void
     {
         $this
             ->setName('info')
-            ->setDescription('Show information about the application')
-            ->addOption('env', 'e', InputOption::VALUE_REQUIRED, 'The environment', 'dev')
-            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'The location of the configuration file to use')
-            ->addOption('team', null, InputOption::VALUE_REQUIRED, 'Override the team');
+            ->setDescription('Show information about the application');
+        parent::configure();
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        /** @var string $environment */
-        $environment = $input->getOption('env');
-        /** @var string|null $configFileName */
-        $configFileName = $input->getOption('config');
-        $config = Config::loadConfig($configFileName, $environment, $input->getOption('team'));
-        $appName = $config['name'];
+        [
+            'appName' => $appName,
+            'environmentName' => $environmentName,
+            'config' => $config,
+        ] = $this->parseStandardOptions($input);
+
         IO::writeln([
-            sprintf("%s %s / %s", Styles::brefLogo(), Styles::bold($appName), Styles::bold($environment)),
+            sprintf("%s %s / %s", Styles::brefLogo(), Styles::bold($appName), Styles::bold($environmentName)),
             '',
         ]);
 
         $brefCloud = new BrefCloudClient;
-        $environment = $brefCloud->getEnvironment($config['team'], $appName, $environment);
+        $environment = $brefCloud->getEnvironment($config['team'], $appName, $environmentName);
         $environmentLink = $brefCloud->url . '/environment/' . $environment['id'];
         IO::writeln([
             "<href=$environmentLink>" . Styles::gray($environmentLink) . '</>',