From 7505134121df045820565cb800ed8ac658b742b1 Mon Sep 17 00:00:00 2001 From: morgan Date: Wed, 20 Nov 2024 11:40:42 +0100 Subject: [PATCH] Improve Check Requirements Command --- classes/Commands/CheckRequirementsCommand.php | 16 +++++++++++++++- classes/Task/Miscellaneous/UpdateConfig.php | 6 ++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/classes/Commands/CheckRequirementsCommand.php b/classes/Commands/CheckRequirementsCommand.php index 40a1d42b9..ea45a1b96 100644 --- a/classes/Commands/CheckRequirementsCommand.php +++ b/classes/Commands/CheckRequirementsCommand.php @@ -30,6 +30,7 @@ use Exception; use PrestaShop\Module\AutoUpgrade\Exceptions\DistributionApiException; use PrestaShop\Module\AutoUpgrade\Exceptions\UpgradeException; +use PrestaShop\Module\AutoUpgrade\Parameters\UpgradeConfiguration; use PrestaShop\Module\AutoUpgrade\Services\DistributionApiService; use PrestaShop\Module\AutoUpgrade\Services\PhpVersionResolverService; use PrestaShop\Module\AutoUpgrade\Task\ExitCode; @@ -43,7 +44,7 @@ class CheckRequirementsCommand extends AbstractCommand { /** @var string */ - protected static $defaultName = 'update:check'; + protected static $defaultName = 'update:check-requirements'; const MODULE_CONFIG_DIR = 'autoupgrade'; /** @var UpgradeSelfCheck */ private $upgradeSelfCheck; @@ -58,6 +59,8 @@ protected function configure(): void ->setDescription('Check all prerequisites for an update.') ->setHelp('This command allows you to check the prerequisites necessary for the proper functioning of an update.') ->addOption('config-file-path', null, InputOption::VALUE_REQUIRED, 'Configuration file location for update.') + ->addOption('zip', null, InputOption::VALUE_REQUIRED, 'Sets the archive zip file for a local update.') + ->addOption('xml', null, InputOption::VALUE_REQUIRED, 'Sets the archive xml file for a local update.') ->addArgument('admin-dir', InputArgument::REQUIRED, 'The admin directory name.'); } @@ -70,6 +73,17 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int $this->setupEnvironment($input, $output); $this->output = $output; + $options = [ + UpgradeConfiguration::ARCHIVE_ZIP => 'zip', + UpgradeConfiguration::ARCHIVE_XML => 'xml', + ]; + foreach ($options as $configKey => $optionName) { + $optionValue = $input->getOption($optionName); + if ($optionValue !== null) { + $this->consoleInputConfiguration[$configKey] = $optionValue; + } + } + $configPath = $input->getOption('config-file-path'); $exitCode = $this->loadConfiguration($configPath); if ($exitCode !== ExitCode::SUCCESS) { diff --git a/classes/Task/Miscellaneous/UpdateConfig.php b/classes/Task/Miscellaneous/UpdateConfig.php index 89749498e..f0eb93e06 100644 --- a/classes/Task/Miscellaneous/UpdateConfig.php +++ b/classes/Task/Miscellaneous/UpdateConfig.php @@ -72,6 +72,12 @@ public function run(): int } } + // If no channel is specified, and there is a configuration relating to archive files, we deduce that the channel is local + $archiveFilesConfExist = isset($config[UpgradeConfiguration::ARCHIVE_XML]) || isset($config[UpgradeConfiguration::ARCHIVE_ZIP]); + if (!isset($config[UpgradeConfiguration::CHANNEL]) && $archiveFilesConfExist) { + $config[UpgradeConfiguration::CHANNEL] = UpgradeConfiguration::CHANNEL_LOCAL; + } + $isLocal = $config[UpgradeConfiguration::CHANNEL] === UpgradeConfiguration::CHANNEL_LOCAL; $error = $this->container->getConfigurationValidator()->validate($config);