Commit 202302b7 authored by Johan Cwiklinski's avatar Johan Cwiklinski

Merge branch '9.4/bugfixes' into 9.5/bugfixes

parents b3e7b253 c4b28837
...@@ -156,20 +156,18 @@ class InstallCommand extends Command implements ForceNoPluginsOptionCommandInter ...@@ -156,20 +156,18 @@ class InstallCommand extends Command implements ForceNoPluginsOptionCommandInter
protected function interact(InputInterface $input, OutputInterface $output) { protected function interact(InputInterface $input, OutputInterface $output) {
$options = [ $questions = [
'db-name' => __('Database name:'), // Required 'db-name' => new Question(__('Database name:'), ''), // Required
'db-user' => __('Database user:'), // Required 'db-user' => new Question(__('Database user:'), ''), // Required
'db-password' => __('Database password:'), // Prompt if null (passed without value) 'db-password' => new Question(__('Database password:'), ''), // Prompt if null (passed without value)
]; ];
foreach ($options as $name => $label) { $questions['db-password']->setHidden(true); // Make password input hidden
foreach ($questions as $name => $question) {
if (null === $input->getOption($name)) { if (null === $input->getOption($name)) {
/** @var QuestionHelper $question_helper */ /** @var QuestionHelper $question_helper */
$question_helper = $this->getHelper('question'); $question_helper = $this->getHelper('question');
$value = $question_helper->ask( $value = $question_helper->ask($input, $output, $question);
$input,
$output,
new Question($label, '')
);
$input->setOption($name, $value); $input->setOption($name, $value);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment