Refactoring all commands away from using the service locator

weaverryan · weaverryan · commit af2b38f86f0b · 2017-12-18T11:42:57.000-05:00
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -11,7 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,8 +21,19 @@
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>
  */
-class ActivateUserCommand extends ContainerAwareCommand
+class ActivateUserCommand extends Command
 {
+    protected static $defaultName = 'fos:user:activate';
+
+    private $userManipulator;
+
+    public function __construct(UserManipulator $userManipulator)
+    {
+        parent::__construct();
+
+        $this->userManipulator = $userManipulator;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -48,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $username = $input->getArgument('username');
 
-        $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
+        $manipulator = $this->userManipulator;
         $manipulator->activate($username);
 
         $output->writeln(sprintf('User "%s" has been activated.', $username));
diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -11,7 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,8 +21,20 @@
 /**
  * ChangePasswordCommand.
  */
-class ChangePasswordCommand extends ContainerAwareCommand
+class ChangePasswordCommand extends Command
 {
+    protected static $defaultName = 'fos:user:change-password';
+
+    private $userManipulator;
+
+    public function __construct(UserManipulator $userManipulator)
+    {
+        parent::__construct();
+
+        $this->userManipulator = $userManipulator;
+    }
+
+
     /**
      * {@inheritdoc}
      */
@@ -57,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $username = $input->getArgument('username');
         $password = $input->getArgument('password');
 
-        $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
+        $manipulator = $this->userManipulator;
         $manipulator->changePassword($username, $password);
 
         $output->writeln(sprintf('Changed password for user <comment>%s</comment>', $username));
diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -11,7 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -23,8 +24,19 @@
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Luis Cordova <cordoval@gmail.com>
  */
-class CreateUserCommand extends ContainerAwareCommand
+class CreateUserCommand extends Command
 {
+    protected static $defaultName = 'fos:user:create';
+
+    private $userManipulator;
+
+    public function __construct(UserManipulator $userManipulator)
+    {
+        parent::__construct();
+
+        $this->userManipulator = $userManipulator;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -74,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $inactive = $input->getOption('inactive');
         $superadmin = $input->getOption('super-admin');
 
-        $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
+        $manipulator = $this->userManipulator;
         $manipulator->create($username, $password, $email, !$inactive, $superadmin);
 
         $output->writeln(sprintf('Created user <comment>%s</comment>', $username));
diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -11,7 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,8 +21,19 @@
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>
  */
-class DeactivateUserCommand extends ContainerAwareCommand
+class DeactivateUserCommand extends Command
 {
+    protected static $defaultName = 'fos:user:deactivate';
+
+    private $userManipulator;
+
+    public function __construct(UserManipulator $userManipulator)
+    {
+        parent::__construct();
+
+        $this->userManipulator = $userManipulator;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -48,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $username = $input->getArgument('username');
 
-        $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
+        $manipulator = $this->userManipulator;
         $manipulator->deactivate($username);
 
         $output->writeln(sprintf('User "%s" has been deactivated.', $username));
diff --git a/Command/DemoteUserCommand.php b/Command/DemoteUserCommand.php
@@ -20,6 +20,8 @@
  */
 class DemoteUserCommand extends RoleCommand
 {
+    protected static $defaultName = 'fos:user:demote';
+
     /**
      * {@inheritdoc}
      */
diff --git a/Command/PromoteUserCommand.php b/Command/PromoteUserCommand.php
@@ -22,6 +22,8 @@
  */
 class PromoteUserCommand extends RoleCommand
 {
+    protected static $defaultName = 'fos:user:promote';
+
     /**
      * {@inheritdoc}
      */
diff --git a/Command/RoleCommand.php b/Command/RoleCommand.php
@@ -12,7 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -22,8 +22,17 @@
 /**
  * @author Lenar Lõhmus <lenar@city.ee>
  */
-abstract class RoleCommand extends ContainerAwareCommand
+abstract class RoleCommand extends Command
 {
+    private $userManipulator;
+
+    public function __construct(UserManipulator $userManipulator)
+    {
+        parent::__construct();
+
+        $this->userManipulator = $userManipulator;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -54,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new \RuntimeException('Not enough arguments.');
         }
 
-        $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
+        $manipulator = $this->userManipulator;
         $this->executeRoleCommand($manipulator, $output, $username, $super, $role);
     }
 
diff --git a/Resources/config/commands.xml b/Resources/config/commands.xml
@@ -6,21 +6,27 @@
 
     <services>
         <service id="fos_user.command.activate_user" class="FOS\UserBundle\Command\ActivateUserCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:activate" />
         </service>
         <service id="fos_user.command.change_password" class="FOS\UserBundle\Command\ChangePasswordCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:change-password" />
         </service>
         <service id="fos_user.command.create_user" class="FOS\UserBundle\Command\CreateUserCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:create" />
         </service>
         <service id="fos_user.command.deactivate_user" class="FOS\UserBundle\Command\DeactivateUserCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:deactivate" />
         </service>
         <service id="fos_user.command.demote_user" class="FOS\UserBundle\Command\DemoteUserCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:demote" />
         </service>
         <service id="fos_user.command.promote_user" class="FOS\UserBundle\Command\PromoteUserCommand">
+            <argument type="service" id="fos_user.util.user_manipulator" />
             <tag name="console.command" command="fos:user:promote" />
         </service>
     </services>

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`*/`
`21`	`21`	`class DemoteUserCommand extends RoleCommand`
`22`	`22`	`{`
	`23`	`+ protected static $defaultName = 'fos:user:demote';`
	`24`	`+`
`23`	`25`	`/**`
`24`	`26`	`* {@inheritdoc}`
`25`	`27`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`class PromoteUserCommand extends RoleCommand`
`24`	`24`	`{`
	`25`	`+ protected static $defaultName = 'fos:user:promote';`
	`26`	`+`
`25`	`27`	`/**`
`26`	`28`	`* {@inheritdoc}`
`27`	`29`	`*/`