Skip to content

Commit 5e70487

Browse files
committed
BUG#AC-901: Cant install Magento in interactive mode
1 parent 773e35f commit 5e70487

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

setup/src/Magento/Setup/Console/Command/InstallCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
234234
$consoleLogger = new ConsoleLogger($output);
235235
$installer = $this->installerFactory->create($consoleLogger);
236236
$isInteractiveSetup = $input->getOption(self::INPUT_KEY_INTERACTIVE_SETUP) ?? false;
237-
$installer->install($isInteractiveSetup ? $this->interactiveSetupUserInput : $input->getOptions());
237+
$installer->install($isInteractiveSetup ? array_merge($input->getOptions(), $this->interactiveSetupUserInput) :
238+
$input->getOptions());
238239

239240
$importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
240241
$arrayInput = new ArrayInput([]);

setup/src/Magento/Setup/Model/ConfigModel.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Framework\App\DeploymentConfig\Writer;
1212
use Magento\Framework\Setup\Option\AbstractConfigOption;
1313
use Magento\Framework\Setup\FilePermissions;
14-
use \Magento\Setup\Exception as SetupException;
14+
use Magento\Setup\Exception as SetupException;
1515

1616
class ConfigModel
1717
{
@@ -142,7 +142,6 @@ public function validate(array $inputOptions)
142142
if ($inputValue !== null) {
143143
$option->validate($inputValue);
144144
}
145-
146145
} catch (\InvalidArgumentException $e) {
147146
$errors[] = $e->getMessage();
148147
}

0 commit comments

Comments
 (0)