Merge branch '2.x'

Author: XWB

.php_cs.dist

@@ -12,7 +12,7 @@ EOF;
 return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'long'],
+        'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_unsets' => true,
         'header_comment' => ['header' => $header],
         'linebreak_after_opening_tag' => true,

Changelog.md

@@ -1,9 +1,22 @@
 Changelog
 =========
 
-### 2.1.3 (2018-xx-xx)
+### 2.2.0 (2020-01-xx)
+=======
 
+* Marked all controllers final.
 * Added Mongolian translation.
+* Added an email provider.
+* Added a custom user checker.
+* Added PHP 7.3 support.
+* Removed fieldName attribute in MongoDB mapping.
+* Registration confirmation now redirects to login page if token is invalid.
+* User model will not rely on `AdvancedUserInterface` anymore.
+* Self-salting password encoders will not create a salt anymore.
+* FlashListener constructor now accepts `SessionInterface`.
+* Fixed `UserManagerInterface::updateUser` signature.
+* Fixed several Symfony deprecation notices.
+* Fixed several translations.
 
 ### 2.1.2 (2018-03-08)
 

Command/ActivateUserCommand.php

@@ -42,9 +42,9 @@ protected function configure()
         $this
             ->setName('fos:user:activate')
             ->setDescription('Activate a user')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
-            ))
+            ])
             ->setHelp(<<<'EOT'
 The <info>fos:user:activate</info> command activates a user (so they will be able to log in):
 
@@ -63,6 +63,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->userManipulator->activate($username);
 
         $output->writeln(sprintf('User "%s" has been activated.', $username));
+
+        return 0;
     }
 
     /**

Command/ChangePasswordCommand.php

@@ -39,10 +39,10 @@ protected function configure()
         $this
             ->setName('fos:user:change-password')
             ->setDescription('Change the password of a user.')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('password', InputArgument::REQUIRED, 'The password'),
-            ))
+            ])
             ->setHelp(<<<'EOT'
 The <info>fos:user:change-password</info> command changes the password of a user:
 
@@ -69,14 +69,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->userManipulator->changePassword($username, $password);
 
         $output->writeln(sprintf('Changed password for user <comment>%s</comment>', $username));
+
+        return 0;
     }
 
     /**
      * {@inheritdoc}
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $questions = array();
+        $questions = [];
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please give the username:');

Command/CreateUserCommand.php

@@ -45,13 +45,13 @@ protected function configure()
         $this
             ->setName('fos:user:create')
             ->setDescription('Create a user.')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('email', InputArgument::REQUIRED, 'The email'),
                 new InputArgument('password', InputArgument::REQUIRED, 'The password'),
                 new InputOption('super-admin', null, InputOption::VALUE_NONE, 'Set the user as super admin'),
                 new InputOption('inactive', null, InputOption::VALUE_NONE, 'Set the user as inactive'),
-            ))
+            ])
             ->setHelp(<<<'EOT'
 The <info>fos:user:create</info> command creates a user:
 
@@ -89,14 +89,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->userManipulator->create($username, $password, $email, !$inactive, $superadmin);
 
         $output->writeln(sprintf('Created user <comment>%s</comment>', $username));
+
+        return 0;
     }
 
     /**
      * {@inheritdoc}
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $questions = array();
+        $questions = [];
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');

Command/DeactivateUserCommand.php

@@ -42,9 +42,9 @@ protected function configure()
         $this
             ->setName('fos:user:deactivate')
             ->setDescription('Deactivate a user')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
-            ))
+            ])
             ->setHelp(<<<'EOT'
 The <info>fos:user:deactivate</info> command deactivates a user (will not be able to log in)
 
@@ -63,6 +63,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->userManipulator->deactivate($username);
 
         $output->writeln(sprintf('User "%s" has been deactivated.', $username));
+
+        return 0;
     }
 
     /**

Command/RoleCommand.php

@@ -39,11 +39,11 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure()
     {
         $this
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('role', InputArgument::OPTIONAL, 'The role'),
                 new InputOption('super', null, InputOption::VALUE_NONE, 'Instead specifying role, use this to quickly add the super administrator role'),
-            ));
+            ]);
     }
 
     /**
@@ -65,16 +65,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $manipulator = $this->userManipulator;
         $this->executeRoleCommand($manipulator, $output, $username, $super, $role);
+
+        return 0;
     }
 
     /**
      * @see Command
      *
-     * @param UserManipulator $manipulator
-     * @param OutputInterface $output
-     * @param string          $username
-     * @param bool            $super
-     * @param string          $role
+     * @param string $username
+     * @param bool   $super
+     * @param string $role
      */
     abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role);
 
@@ -83,7 +83,7 @@ abstract protected function executeRoleCommand(UserManipulator $manipulator, Out
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $questions = array();
+        $questions = [];
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');

Controller/ChangePasswordController.php

@@ -30,6 +30,8 @@
  *
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Christophe Coevoet <stof@notk.org>
+ *
+ * @final
  */
 class ChangePasswordController extends Controller
 {
@@ -47,8 +49,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
     /**
      * Change user password.
      *
-     * @param Request $request
-     *
      * @return Response
      */
     public function changePasswordAction(Request $request)
@@ -86,8 +86,8 @@ public function changePasswordAction(Request $request)
             return $response;
         }
 
-        return $this->render('@FOSUser/ChangePassword/change_password.html.twig', array(
+        return $this->render('@FOSUser/ChangePassword/change_password.html.twig', [
             'form' => $form->createView(),
-        ));
+        ]);
     }
 }

Controller/GroupController.php

@@ -31,6 +31,8 @@
  *
  * @author Thibault Duplessis <thibault.duplessis@gmail.com>
  * @author Christophe Coevoet <stof@notk.org>
+ *
+ * @final
  */
 class GroupController extends Controller
 {
@@ -50,9 +52,9 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
      */
     public function listAction()
     {
-        return $this->render('@FOSUser/Group/list.html.twig', array(
+        return $this->render('@FOSUser/Group/list.html.twig', [
             'groups' => $this->groupManager->findGroups(),
-        ));
+        ]);
     }
 
     /**
@@ -64,16 +66,15 @@ public function listAction()
      */
     public function showAction($groupName)
     {
-        return $this->render('@FOSUser/Group/show.html.twig', array(
+        return $this->render('@FOSUser/Group/show.html.twig', [
             'group' => $this->findGroupBy('name', $groupName),
-        ));
+        ]);
     }
 
     /**
      * Edit one group, show the edit form.
      *
-     * @param Request $request
-     * @param string  $groupName
+     * @param string $groupName
      *
      * @return Response
      */
@@ -100,7 +101,7 @@ public function editAction(Request $request, $groupName)
             $this->groupManager->updateGroup($group);
 
             if (null === $response = $event->getResponse()) {
-                $url = $this->generateUrl('fos_user_group_show', array('groupName' => $group->getName()));
+                $url = $this->generateUrl('fos_user_group_show', ['groupName' => $group->getName()]);
                 $response = new RedirectResponse($url);
             }
 
@@ -109,17 +110,15 @@ public function editAction(Request $request, $groupName)
             return $response;
         }
 
-        return $this->render('@FOSUser/Group/edit.html.twig', array(
+        return $this->render('@FOSUser/Group/edit.html.twig', [
             'form' => $form->createView(),
             'group_name' => $group->getName(),
-        ));
+        ]);
     }
 
     /**
      * Show the new form.
      *
-     * @param Request $request
-     *
      * @return Response
      */
     public function newAction(Request $request)
@@ -140,7 +139,7 @@ public function newAction(Request $request)
             $this->groupManager->updateGroup($group);
 
             if (null === $response = $event->getResponse()) {
-                $url = $this->generateUrl('fos_user_group_show', array('groupName' => $group->getName()));
+                $url = $this->generateUrl('fos_user_group_show', ['groupName' => $group->getName()]);
                 $response = new RedirectResponse($url);
             }
 
@@ -149,16 +148,15 @@ public function newAction(Request $request)
             return $response;
         }
 
-        return $this->render('@FOSUser/Group/new.html.twig', array(
+        return $this->render('@FOSUser/Group/new.html.twig', [
             'form' => $form->createView(),
-        ));
+        ]);
     }
 
     /**
      * Delete one group.
      *
-     * @param Request $request
-     * @param string  $groupName
+     * @param string $groupName
      *
      * @return RedirectResponse
      */

Controller/ProfileController.php

@@ -29,6 +29,8 @@
  * Controller managing the user profile.
  *
  * @author Christophe Coevoet <stof@notk.org>
+ *
+ * @final
  */
 class ProfileController extends Controller
 {
@@ -53,16 +55,14 @@ public function showAction()
             throw new AccessDeniedException('This user does not have access to this section.');
         }
 
-        return $this->render('@FOSUser/Profile/show.html.twig', array(
+        return $this->render('@FOSUser/Profile/show.html.twig', [
             'user' => $user,
-        ));
+        ]);
     }
 
     /**
      * Edit the user.
      *
-     * @param Request $request
-     *
      * @return Response
      */
     public function editAction(Request $request)
@@ -100,8 +100,8 @@ public function editAction(Request $request)
             return $response;
         }
 
-        return $this->render('@FOSUser/Profile/edit.html.twig', array(
+        return $this->render('@FOSUser/Profile/edit.html.twig', [
             'form' => $form->createView(),
-        ));
+        ]);
     }
 }