Merge pull request #56 from thibaut-decherit/dev

Dev

Author: thibaut-decherit

src/Controller/User/PasswordResetController.php

@@ -64,20 +64,20 @@ public function request(
         }
 
         $em = $this->getDoctrine()->getManager();
-        $businessUsernameOrEmail = StringHelper::truncateToMySQLVarcharMaxLength(
-            $request->request->get('businessUsernameOrEmail')
+        $login = StringHelper::truncateToMySQLVarcharMaxLength(
+            $request->request->get('login')
         );
 
-        if (preg_match('/^.+@\S+\.\S+$/', $businessUsernameOrEmail)) {
+        if (preg_match('/^.+@\S+\.\S+$/', $login)) {
             /**
              * @var User $user
              */
-            $user = $em->getRepository(User::class)->findOneBy(['email' => $businessUsernameOrEmail]);
+            $user = $em->getRepository(User::class)->findOneBy(['email' => $login]);
         } else {
             /**
              * @var User $user
              */
-            $user = $em->getRepository(User::class)->findOneBy(['businessUsername' => $businessUsernameOrEmail]);
+            $user = $em->getRepository(User::class)->findOneBy(['businessUsername' => $login]);
         }
 
         $this->addFlash(

templates/form/user/_password_reset_request.html.twig

@@ -19,7 +19,7 @@
 
     <div class="form-group">
         <input type="text" class="form-control border-input mb-3 rounded-0" id="username"
-               name="businessUsernameOrEmail" placeholder="{{ 'user.username_or_email_address'|trans }}"
+               name="login" placeholder="{{ 'user.username_or_email_address'|trans }}"
                aria-label="email" aria-describedby="email" required="required"
         />
     </div>