Adding Symfony4 support

.travis.yml

@@ -5,7 +5,6 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
 
 env:
   global:
@@ -19,9 +18,9 @@ matrix:
     - php: 5.5
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-  allow_failures:
-    - php: hhvm
+      env: DEPENDENCIES="symfony/lts:^2"
+    - php: 7.1
+      env: DEPENDENCIES="symfony/lts:^3"
 
 sudo: false
 
@@ -30,8 +29,8 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+  - if [[ -v $DEPENDENCIES ]]; then composer require --no-update $DEPENDENCIES; fi;
+  - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 

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 <[email protected]>
  */
-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));

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,19 @@
 /**
  * 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 +69,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));

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 <[email protected]>
  * @author Luis Cordova <[email protected]>
  */
-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));

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 <[email protected]>
  */
-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));

Command/DemoteUserCommand.php

@@ -20,6 +20,8 @@
  */
 class DemoteUserCommand extends RoleCommand
 {
+    protected static $defaultName = 'fos:user:demote';
+
     /**
      * {@inheritdoc}
      */

Command/PromoteUserCommand.php

@@ -22,6 +22,8 @@
  */
 class PromoteUserCommand extends RoleCommand
 {
+    protected static $defaultName = 'fos:user:promote';
+
     /**
      * {@inheritdoc}
      */

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 <[email protected]>
  */
-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);
     }
 

Controller/ChangePasswordController.php

@@ -18,7 +18,7 @@
 use FOS\UserBundle\FOSUserEvents;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManagerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,8 +31,19 @@
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
  */
-class ChangePasswordController extends Controller
+class ChangePasswordController extends AbstractController
 {
+    private $eventDispatcher;
+    private $formFactory;
+    private $userManager;
+
+    public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->formFactory = $formFactory;
+        $this->userManager = $userManager;
+    }
+
     /**
      * Change user password.
      *
@@ -47,8 +58,7 @@ public function changePasswordAction(Request $request)
             throw new AccessDeniedException('This user does not have access to this section.');
         }
 
-        /** @var $dispatcher EventDispatcherInterface */
-        $dispatcher = $this->get('event_dispatcher');
+        $dispatcher = $this->eventDispatcher;
 
         $event = new GetResponseUserEvent($user, $request);
         $dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_INITIALIZE, $event);
@@ -57,22 +67,16 @@ public function changePasswordAction(Request $request)
             return $event->getResponse();
         }
 
-        /** @var $formFactory FactoryInterface */
-        $formFactory = $this->get('fos_user.change_password.form.factory');
-
-        $form = $formFactory->createForm();
+        $form = $this->formFactory->createForm();
         $form->setData($user);
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            /** @var $userManager UserManagerInterface */
-            $userManager = $this->get('fos_user.user_manager');
-
             $event = new FormEvent($form, $request);
             $dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_SUCCESS, $event);
 
-            $userManager->updateUser($user);
+            $this->userManager->updateUser($user);
 
             if (null === $response = $event->getResponse()) {
                 $url = $this->generateUrl('fos_user_profile_show');