[user:*] Update user commands. (#3683)

hechoendrupal · Jan 11, 2018 · 98023b3 · 98023b3
1 parent a8acc09
commit 98023b3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
diff --git a/src/Command/User/DeleteCommand.php b/src/Command/User/DeleteCommand.php
@@ -78,14 +78,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
 
-        $user = $input->getOption('user');
-        if (!$user) {
-            $user = $io->askEmpty(
-                $this->trans('commands.user.delete.questions.user'),
-                null
-            );
-            $input->setOption('user', $user);
-        }
+        $user = $this->getUserOption();
 
         $roles = $input->getOption('roles');
 

diff --git a/src/Command/User/LoginCleanAttemptsCommand.php b/src/Command/User/LoginCleanAttemptsCommand.php
@@ -58,16 +58,7 @@ protected function configure()
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
-        $user = $input->getArgument('user');
-        if (!$user) {
-            $user = $io->ask(
-                $this->trans('commands.user.login.clear.attempts.questions.user')
-            );
-
-            $input->setArgument('user', $user);
-        }
+        $this->getUserArgument();
     }
 
     /**

diff --git a/src/Command/User/LoginUrlCommand.php b/src/Command/User/LoginUrlCommand.php
@@ -52,14 +52,12 @@ protected function configure()
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $io = new DrupalStyle($input, $output);
-
-        $this->userQuestion();
+        $this->getUserArgument();
     }
 
     /**
-   * {@inheritdoc}
-   */
+     * {@inheritdoc}
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);

diff --git a/src/Command/User/PasswordResetCommand.php b/src/Command/User/PasswordResetCommand.php
@@ -72,7 +72,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
 
-        $this->userQuestion();
+        $this->getUserArgument();
 
         $password = $input->getArgument('password');
         if (!$password) {

diff --git a/src/Command/User/UserBase.php b/src/Command/User/UserBase.php
@@ -68,20 +68,35 @@ public function getUsers()
         return $userList;
     }
 
-    public function userQuestion()
+    private function userQuestion($user)
     {
-        $input = $this->getIo()->getInput();
-        $user = $input->getArgument('user');
-
         if (!$user) {
             $user = $this->getIo()->choiceNoList(
                 $this->trans('commands.user.password.reset.questions.user'),
                 $this->getUsers()
             );
-
-            $input->setArgument('user', $user);
         }
 
         return $user;
     }
+
+    public function getUserOption()
+    {
+        $input = $this->getIo()->getInput();
+
+        $user = $this->userQuestion($input->getOption('user'));
+        $input->setOption('user', $user);
+
+        return $user;
+    }
+
+    public function getUserArgument()
+    {
+        $input = $this->getIo()->getInput();
+
+        $user = $this->userQuestion($input->getArgument('user'));
+        $input->setArgument('user', $user);
+
+        return $user;
+    }
 }