makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12684] Extract interactivity to a method

Browse source 
PHPBB3-12684
This commit is contained in:
Matt Friedman 2016-03-09 15:16:23 -08:00
parent 00bf1ef8b8
commit 693664f278
1 changed files with 52 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
phpBB/phpbb/console/command/user/add.php
View file

@ -125,43 +125,7 @@ class add extends \phpbb\console\command\command
{ {
$io = new SymfonyStyle($input, $output); $io = new SymfonyStyle($input, $output);
$helper = $this->getHelper('question'); $data = $this->interact($input, $output);
$data = array(
'username' => $input->getOption('username'),
'new_password' => $input->getOption('password'),
'email' => $input->getOption('email'),
);
if (!$data['username'])
{
$question = new Question($this->ask_user('USERNAME'));
$data['username'] = $helper->ask($input, $output, $question);
}
if (!$data['new_password'])
{
$question = new Question($this->ask_user('PASSWORD'));
$question->setValidator(function ($value) use ($helper, $input, $output) {
$question = new Question($this->ask_user('CONFIRM_PASSWORD'));
$question->setHidden(true);
if ($helper->ask($input, $output, $question) != $value)
{
throw new runtime_exception($this->language->lang('NEW_PASSWORD_ERROR'));
}
return $value;
});
$question->setHidden(true);
$question->setMaxAttempts(5);
$data['new_password'] = $helper->ask($input, $output, $question);
}
if (!$data['email'])
{
$question = new Question($this->ask_user('EMAIL_ADDRESS'));
$data['email'] = $helper->ask($input, $output, $question);
}
try try
{ {
@ -203,6 +167,57 @@ class add extends \phpbb\console\command\command
return 0; return 0;
} }
/**
* Interact with the user to obtain the required options
*
* @param InputInterface $input The input stream used to get the options
* @param OutputInterface $output The output stream, used to print messages
*
* @return array Array of required user options
*/
protected function interact(InputInterface $input, OutputInterface $output)
{
$helper = $this->getHelper('question');
$data = array(
'username' => $input->getOption('username'),
'new_password' => $input->getOption('password'),
'email' => $input->getOption('email'),
);
if (!$data['username'])
{
$question = new Question($this->ask_user('USERNAME'));
$data['username'] = $helper->ask($input, $output, $question);
}
if (!$data['new_password'])
{
$question = new Question($this->ask_user('PASSWORD'));
$question->setValidator(function ($value) use ($helper, $input, $output) {
$question = new Question($this->ask_user('CONFIRM_PASSWORD'));
$question->setHidden(true);
if ($helper->ask($input, $output, $question) != $value)
{
throw new runtime_exception($this->language->lang('NEW_PASSWORD_ERROR'));
}
return $value;
});
$question->setHidden(true);
$question->setMaxAttempts(5);
$data['new_password'] = $helper->ask($input, $output, $question);
}
if (!$data['email'])
{
$question = new Question($this->ask_user('EMAIL_ADDRESS'));
$data['email'] = $helper->ask($input, $output, $question);
}
return $data;
}
/** /**
* Validate the submitted user data * Validate the submitted user data
* *