diff --git a/src/Controller/CapsuleController.php b/src/Controller/CapsuleController.php
index 2efa2b74dc3baf094911b30a3d7053111e2e7543..4f37f03f6ee385b023169871cd49843d887e6a8c 100755
--- a/src/Controller/CapsuleController.php
+++ b/src/Controller/CapsuleController.php
@@ -25,18 +25,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class CapsuleController extends AbstractController
{
- private CapsuleRepository $capsule_repository;
- private TranslatorInterface $translator;
- private EntityManagerInterface $entity_manager;
-
public function __construct(
- CapsuleRepository $capsule_repository,
- TranslatorInterface $translator,
- EntityManagerInterface $entity_manager
+ private CapsuleRepository $capsule_repository,
+ private TranslatorInterface $translator,
+ private EntityManagerInterface $entity_manager
) {
- $this->capsule_repository = $capsule_repository;
- $this->translator = $translator;
- $this->entity_manager = $entity_manager;
}
#[Route('/my_capsules', name:'capsule_list')]
@@ -76,8 +69,8 @@ class CapsuleController extends AbstractController
5
);
- return $this->render('capsule/index.html.twig', [
- 'filterByGroupForm' => $form->createView(),
+ return $this->renderForm('capsule/index.html.twig', [
+ 'filterByGroupForm' => $form,
'capsules' => $capsules,
'current_user' => $current_user,
'legacy_url' => $this->getParameter('app.legacy_external_prefix')
@@ -106,8 +99,8 @@ class CapsuleController extends AbstractController
]);
}
- return $this->render('capsule/create.html.twig', [
- 'capsuleCreationForm' => $form->createView()
+ return $this->renderForm('capsule/create.html.twig', [
+ 'capsuleCreationForm' => $form
]);
}
@@ -161,10 +154,8 @@ class CapsuleController extends AbstractController
}
#[Route('/capsule/delete/{id}', name:'delete_capsule')]
- public function delete(
- int $id,
- Request $request
- ): Response {
+ public function delete(int $id, Request $request): Response
+ {
$form = $this->createForm(DeleteCapsuleFormType::class);
$form->handleRequest($request);
$current_user = $this->getUser();
@@ -215,8 +206,8 @@ class CapsuleController extends AbstractController
return $this->redirectToRoute('capsule_list');
}
- return $this->render('capsule/delete.html.twig', [
- 'deleteCapsuleForm' => $form->createView(),
+ return $this->renderForm('capsule/delete.html.twig', [
+ 'deleteCapsuleForm' => $form,
'capsule_name' => $capsule_name
]);
}
@@ -282,8 +273,8 @@ class CapsuleController extends AbstractController
]);
}
- return $this->render('capsule/duplicate.html.twig', [
- 'duplicateCapsuleForm' => $form->createView(),
+ return $this->renderForm('capsule/duplicate.html.twig', [
+ 'duplicateCapsuleForm' => $form,
'capsule_name' => $parent_capsule->getName()
]);
}
diff --git a/src/Controller/CapsuleEditorController.php b/src/Controller/CapsuleEditorController.php
index 4628df144f58c0f640b129daee3820a264cf2699..6b08bbcbecb0eaa7f098600e2e17fa56a4f86750 100755
--- a/src/Controller/CapsuleEditorController.php
+++ b/src/Controller/CapsuleEditorController.php
@@ -23,30 +23,15 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class CapsuleEditorController extends AbstractController
{
- private TranslatorInterface $translator;
- private MailerInterface $mailer;
- private PendingEditorInvitationRepository $capsule_pending_editor_invitation_repository;
- private EntityManagerInterface $entity_manager;
- private UrlGeneratorInterface $urlGenerator;
- private CapsuleRepository $capsule_repository;
- private UserRepository $user_repository;
-
public function __construct(
- MailerInterface $mailer,
- TranslatorInterface $translator,
- PendingEditorInvitationRepository $capsule_pending_editor_invitation_repository,
- EntityManagerInterface $entity_manager,
- UrlGeneratorInterface $urlGenerator,
- CapsuleRepository $capsule_repository,
- UserRepository $user_repository
+ private MailerInterface $mailer,
+ private TranslatorInterface $translator,
+ private PendingEditorInvitationRepository $capsule_pending_editor_invitation_repository,
+ private EntityManagerInterface $entity_manager,
+ private UrlGeneratorInterface $urlGenerator,
+ private CapsuleRepository $capsule_repository,
+ private UserRepository $user_repository
) {
- $this->mailer = $mailer;
- $this->translator = $translator;
- $this->capsule_pending_editor_invitation_repository = $capsule_pending_editor_invitation_repository;
- $this->entity_manager = $entity_manager;
- $this->urlGenerator = $urlGenerator;
- $this->capsule_repository = $capsule_repository;
- $this->user_repository = $user_repository;
}
#[Route('/capsule/{capsule_id}/editors', name:'edit_capsule_editors')]
@@ -108,8 +93,8 @@ class CapsuleEditorController extends AbstractController
$pending_editors = $this->capsule_pending_editor_invitation_repository->findBy(['capsule_id' => $capsule_id]);
- return $this->render('capsule/editors/list_editors.html.twig', [
- 'userPermissionsCapsuleForm' => $form->createView(),
+ return $this->renderForm('capsule/editors/list_editors.html.twig', [
+ 'userPermissionsCapsuleForm' => $form,
'capsule' => $capsule,
'editors' => $current_capsule_editors_users,
'pending_editors' => $pending_editors,
@@ -280,8 +265,8 @@ class CapsuleEditorController extends AbstractController
]);
}
- return $this->render('capsule/editors/remove_editor.html.twig', [
- 'removeEditorForm' => $form->createView(),
+ return $this->renderForm('capsule/editors/remove_editor.html.twig', [
+ 'removeEditorForm' => $form,
'editor_email' => $editor->getEmail(),
'capsule_id' => $capsule_id
]);
@@ -291,7 +276,7 @@ class CapsuleEditorController extends AbstractController
public function removePendingEditor(
int $pending_editor_invitation_id,
int $capsule_id,
- request $request
+ Request $request
): Response {
$form = $this->createForm(RemoveEditorFormType::class);
$form->handleRequest($request);
@@ -340,8 +325,8 @@ class CapsuleEditorController extends AbstractController
]);
}
- return $this->render('capsule/editors/remove_pending_editor.html.twig', [
- 'removeEditorForm' => $form->createView(),
+ return $this->renderForm('capsule/editors/remove_pending_editor.html.twig', [
+ 'removeEditorForm' => $form,
'editor_email' => $pending_editor_invitation->getEmail(),
'capsule_id' => $capsule_id
]);
diff --git a/src/Controller/CapsuleGroupController.php b/src/Controller/CapsuleGroupController.php
index b3eff16ad4e9aa3cd0027a5d65172af9517a6300..0c9f1b286013468d66742a2710c5b173bcff88d5 100755
--- a/src/Controller/CapsuleGroupController.php
+++ b/src/Controller/CapsuleGroupController.php
@@ -21,21 +21,12 @@ use Symfony\Component\Routing\Annotation\Route;
class CapsuleGroupController extends AbstractController
{
- private TranslatorInterface $translator;
- private CapsuleRepository $capsule_repository;
- private EntityManagerInterface $entity_manager;
- private GroupRepository $group_repository;
-
public function __construct(
- TranslatorInterface $translator,
- CapsuleRepository $capsule_repository,
- EntityManagerInterface $entity_manager,
- GroupRepository $group_repository
+ private TranslatorInterface $translator,
+ private CapsuleRepository $capsule_repository,
+ private EntityManagerInterface $entity_manager,
+ private GroupRepository $group_repository
) {
- $this->translator = $translator;
- $this->capsule_repository = $capsule_repository;
- $this->entity_manager = $entity_manager;
- $this->group_repository = $group_repository;
}
#[Route('/my_groups', name:'edit_user_groups')]
@@ -85,8 +76,8 @@ class CapsuleGroupController extends AbstractController
return $this->redirectToRoute('edit_user_groups');
}
- return $this->render('capsule/groups/create.html.twig', [
- 'createCapsuleGroupsForm' => $form->createView()
+ return $this->renderForm('capsule/groups/create.html.twig', [
+ 'createCapsuleGroupsForm' => $form
]);
}
@@ -132,8 +123,8 @@ class CapsuleGroupController extends AbstractController
return $this->redirectToRoute('edit_user_groups');
}
- return $this->render('capsule/groups/delete.html.twig', [
- 'deleteGroupForm' => $form->createView(),
+ return $this->renderForm('capsule/groups/delete.html.twig', [
+ 'deleteGroupForm' => $form,
'group_name' => $group->getName()
]);
}
@@ -187,8 +178,8 @@ class CapsuleGroupController extends AbstractController
]);
}
- return $this->render('capsule/groups/capsule_groups.html.twig', [
- 'selectCapsuleGroupsForm' => $form->createView(),
+ return $this->renderForm('capsule/groups/capsule_groups.html.twig', [
+ 'selectCapsuleGroupsForm' => $form,
'capsule' => $capsule,
'groups' => $capsule_groups_by_author,
'groups_not_added' => $author_capsule_groups_not_added
@@ -244,8 +235,8 @@ class CapsuleGroupController extends AbstractController
]);
}
- return $this->render('capsule/groups/remove.html.twig', [
- 'removeGroupForm' => $form->createView(),
+ return $this->renderForm('capsule/groups/remove.html.twig', [
+ 'removeGroupForm' => $form,
'group_name' => $group->getName(),
'capsule_id' => $capsule_id
]);
diff --git a/src/Controller/FallbackController.php b/src/Controller/FallbackController.php
index f9ed25de3f50dee935e14131e21ce707ade19a54..667c6e7a2a4ad0a9cb0e8736d24789b5aa7e907a 100755
--- a/src/Controller/FallbackController.php
+++ b/src/Controller/FallbackController.php
@@ -30,13 +30,13 @@ class FallbackController extends AbstractController
// use iframe to enhance speed but not for creation
if (! str_starts_with($controller, 'legacy')) {
- $originalController = $request->getPathInfo();
- $originalQueryString = $request->getQueryString();
+ $original_controller = $request->getPathInfo();
+ $original_query_string = $request->getQueryString();
- $extension = strrchr($originalController, '.');
+ $extension = strrchr($original_controller, '.');
if ($extension != '.html' && $extension != '.php' && $extension != false) {
//$url = "{$path_to_legacy_code}{$originalController}";
- $url = "{$originalController}";
+ $url = "{$original_controller}";
try {
$mime = LegacyHelper::getMime($url, $extension);
$response = new BinaryFileResponse($url);
@@ -54,7 +54,7 @@ class FallbackController extends AbstractController
$app_legacy_url_external = strval($this->getParameter('app.legacy_url_external'));
$url = "{$app_legacy_url_external}/" .
- "{$originalController}{$separator}?{$originalQueryString}";
+ "{$original_controller}{$separator}?{$original_query_string}";
$url = preg_replace('(^https?:\/\/[^/]+(:\d+)?)', '', $url);
$pattern = '/\/+/i';
diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
index b3db86defc1beac44d14e8bdc93ca68194acae44..f156772b5f67eba187ee4fb66e834aa12e3e922d 100755
--- a/src/Controller/ProjectController.php
+++ b/src/Controller/ProjectController.php
@@ -19,11 +19,8 @@ use ZipArchive;
class ProjectController extends AbstractController
{
- private TranslatorInterface $translator;
-
- public function __construct(TranslatorInterface $translator)
+ public function __construct(private TranslatorInterface $translator)
{
- $this->translator = $translator;
}
#[Route('/project/create', name:'create_project', methods:['POST'])]
@@ -225,8 +222,8 @@ class ProjectController extends AbstractController
]);
}
- return $this->render('project/edit_video_url.html.twig', [
- 'editVideoUrlForm' => $form->createView()
+ return $this->renderForm('project/edit_video_url.html.twig', [
+ 'editVideoUrlForm' => $form
]);
}
}
diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php
index c6c9a99e0ceee5c78501015a830ce6451d298454..4155bb7e618a1911940add7a8a17a066a05719f8 100755
--- a/src/Controller/RegistrationController.php
+++ b/src/Controller/RegistrationController.php
@@ -24,24 +24,20 @@ use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface;
class RegistrationController extends AbstractController
{
- private EmailVerifier $emailVerifier;
- private RequestStack $requestStack;
- private EntityManagerInterface $entity_manager;
-
public function __construct(
- EmailVerifier $emailVerifier,
- RequestStack $requestStack,
- EntityManagerInterface $entity_manager
+ private EmailVerifier $email_verifier,
+ private RequestStack $request_stack,
+ private EntityManagerInterface $entity_manager,
+ private CapsuleRepository $capsule_repository,
+ private UserRepository $user_repository,
+ private PendingEditorInvitationRepository $pending_editor_invitation_repository
) {
- $this->emailVerifier = $emailVerifier;
- $this->requestStack = $requestStack;
- $this->entity_manager = $entity_manager;
}
#[Route('/register', name:'app_register')]
public function register(
Request $request,
- UserPasswordHasherInterface $userPasswordHasher
+ UserPasswordHasherInterface $user_password_hasher
): Response {
if ($this->getUser()) {
return $this->redirectToRoute('capsule_list');
@@ -52,13 +48,13 @@ class RegistrationController extends AbstractController
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $userBuilder = new UserBuilder($userPasswordHasher, $user);
+ $userBuilder = new UserBuilder($user_password_hasher, $user);
$this->entity_manager->persist($userBuilder->createUser());
$this->entity_manager->flush();
// generate a signed url and email it to the user
- $this->emailVerifier->sendEmailConfirmation(
+ $this->email_verifier->sendEmailConfirmation(
'app_verify_email',
$user->getId(),
$user->getEmail(),
@@ -68,30 +64,25 @@ class RegistrationController extends AbstractController
->htmlTemplate('registration/confirmation_email.html.twig')
);
- $this->requestStack->getSession()->set('userid', $user->getId());
+ $this->request_stack->getSession()->set('userid', $user->getId());
return $this->redirectToRoute('app_register_mail_sent');
}
- return $this->render('registration/register.html.twig', [
- 'registrationForm' => $form->createView(),
+ return $this->renderForm('registration/register.html.twig', [
+ 'registrationForm' => $form,
]);
}
#[Route('/verify/email', name:'app_verify_email')]
- public function verifyUserEmail(
- Request $request,
- UserRepository $userRepository,
- PendingEditorInvitationRepository $pending_editor_invitation_repository,
- CapsuleRepository $capsule_repository,
- TranslatorInterface $translator
- ): Response {
+ public function verifyUserEmail(Request $request, TranslatorInterface $translator): Response
+ {
$id = $request->get('id');
if (null === $id) {
return $this->redirectToRoute('app_register');
}
- $user = $userRepository->find($id);
+ $user = $this->user_repository->find($id);
if (null === $user) {
return $this->redirectToRoute('app_register');
@@ -99,18 +90,14 @@ class RegistrationController extends AbstractController
// validate email confirmation link, sets User::isVerified=true and persists
try {
- $this->emailVerifier->handleEmailConfirmation($request, $user);
+ $this->email_verifier->handleEmailConfirmation($request, $user);
} catch (VerifyEmailExceptionInterface $exception) {
$this->addFlash('verify_email_error', $exception->getReason());
return $this->redirectToRoute('app_register');
}
- $this->addCapsuleToConfirmedPreviousPendingEditor(
- $user,
- $pending_editor_invitation_repository,
- $capsule_repository
- );
+ $this->addCapsuleToConfirmedPreviousPendingEditor($user);
$this->addFlash(
'email_verified_success',
@@ -121,10 +108,10 @@ class RegistrationController extends AbstractController
}
#[Route('/register_mail_sent', name:'app_register_mail_sent')]
- public function mailSentMessage(UserRepository $userRepository): Response
+ public function mailSentMessage(): Response
{
- $userid = $this->requestStack->getSession()->get('userid');
- $user = $userRepository->find($userid);
+ $user_id = $this->request_stack->getSession()->get('userid');
+ $user = $this->user_repository->find($user_id);
return $this->render(
'registration/register_mail_sent.html.twig',
@@ -132,19 +119,18 @@ class RegistrationController extends AbstractController
);
}
- private function addCapsuleToConfirmedPreviousPendingEditor(
- User $user,
- PendingEditorInvitationRepository $pending_editor_invitation_repository,
- CapsuleRepository $capsule_repository
- ): void {
- $pending_editor_invitations = $pending_editor_invitation_repository->findBy(['email' => $user->getEmail()]);
+ private function addCapsuleToConfirmedPreviousPendingEditor(User $user): void
+ {
+ $pending_editor_invitations = $this->pending_editor_invitation_repository->findBy(
+ ['email' => $user->getEmail()]
+ );
- if ($pending_editor_invitations == null) {
+ if (! is_array($pending_editor_invitations)) {
return;
}
$capsules_ids = $this->removeInvitations($pending_editor_invitations);
- $this->addEditorToCapsules($capsules_ids, $user, $capsule_repository);
+ $this->addEditorToCapsules($capsules_ids, $user);
}
/**
@@ -169,12 +155,9 @@ class RegistrationController extends AbstractController
/**
* @param array<int> $capsules_ids
*/
- private function addEditorToCapsules(
- array $capsules_ids,
- User $user,
- CapsuleRepository $capsule_repository
- ): void {
- $capsules = $capsule_repository->findBy(['id' => $capsules_ids]);
+ private function addEditorToCapsules(array $capsules_ids, User $user): void
+ {
+ $capsules = $this->capsule_repository->findBy(['id' => $capsules_ids]);
foreach ($capsules as $capsule) {
if (! $capsule instanceof Capsule) {
diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
index 66d73675482eb46b67fb133c612cfc4d7a0de5ff..7169714865de8548846371b272e0a61d08617644 100755
--- a/src/Controller/ResetPasswordController.php
+++ b/src/Controller/ResetPasswordController.php
@@ -23,15 +23,10 @@ class ResetPasswordController extends AbstractController
{
use ResetPasswordControllerTrait;
- private ResetPasswordHelperInterface $resetPasswordHelper;
- private EntityManagerInterface $entityManager;
-
public function __construct(
- ResetPasswordHelperInterface $resetPasswordHelper,
- EntityManagerInterface $entityManager
+ private ResetPasswordHelperInterface $reset_password_helper,
+ private EntityManagerInterface $entity_manager
) {
- $this->resetPasswordHelper = $resetPasswordHelper;
- $this->entityManager = $entityManager;
}
#[Route('', name:'app_forgot_password_request')]
@@ -47,8 +42,8 @@ class ResetPasswordController extends AbstractController
);
}
- return $this->render('reset_password/request.html.twig', [
- 'requestForm' => $form->createView(),
+ return $this->renderForm('reset_password/request.html.twig', [
+ 'requestForm' => $form,
]);
}
@@ -57,19 +52,19 @@ class ResetPasswordController extends AbstractController
{
// Generate a fake token if the user does not exist or someone hit this page directly.
// This prevents exposing whether or not a user was found with the given email address or not
- if (null === ($resetToken = $this->getTokenObjectFromSession())) {
- $resetToken = $this->resetPasswordHelper->generateFakeResetToken();
+ if (null === ($reset_token = $this->getTokenObjectFromSession())) {
+ $reset_token = $this->reset_password_helper->generateFakeResetToken();
}
return $this->render('reset_password/check_email.html.twig', [
- 'resetToken' => $resetToken,
+ 'resetToken' => $reset_token,
]);
}
#[Route('/reset/{token}', name:'app_reset_password')]
public function reset(
Request $request,
- UserPasswordHasherInterface $userPasswordHasher,
+ UserPasswordHasherInterface $user_password_hasher,
string $token = null
): Response {
if ($token) {
@@ -86,7 +81,7 @@ class ResetPasswordController extends AbstractController
}
try {
- $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
+ $user = $this->reset_password_helper->validateTokenAndFetchUser($token);
if (! $user instanceof User) {
throw new \Exception("User should be an instance of UserPasswordHasherInterface");
}
@@ -105,16 +100,16 @@ class ResetPasswordController extends AbstractController
if ($form->isSubmitted() && $form->isValid()) {
// A password reset token should be used only once, remove it.
- $this->resetPasswordHelper->removeResetRequest($token);
+ $this->reset_password_helper->removeResetRequest($token);
// Encode(hash) the plain password, and set it.
- $encodedPassword = $userPasswordHasher->hashPassword(
+ $encoded_password = $user_password_hasher->hashPassword(
$user,
$form->get('plainPassword')->getData()
);
- $user->setPassword($encodedPassword);
- $this->entityManager->flush();
+ $user->setPassword($encoded_password);
+ $this->entity_manager->flush();
// The session is cleaned up after the password has been changed.
$this->cleanSessionAfterReset();
@@ -122,15 +117,17 @@ class ResetPasswordController extends AbstractController
return $this->redirectToRoute('app_login');
}
- return $this->render('reset_password/reset.html.twig', [
- 'resetForm' => $form->createView(),
+ return $this->renderForm('reset_password/reset.html.twig', [
+ 'resetForm' => $form,
]);
}
- private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer): RedirectResponse
- {
- $user = $this->entityManager->getRepository(User::class)->findOneBy([
- 'email' => $emailFormData,
+ private function processSendingPasswordResetEmail(
+ string $email_form_data,
+ MailerInterface $mailer
+ ): RedirectResponse {
+ $user = $this->entity_manager->getRepository(User::class)->findOneBy([
+ 'email' => $email_form_data,
]);
// Do not reveal whether a user account was found or not.
@@ -139,7 +136,7 @@ class ResetPasswordController extends AbstractController
}
try {
- $resetToken = $this->resetPasswordHelper->generateResetToken($user);
+ $resetToken = $this->reset_password_helper->generateResetToken($user);
} catch (ResetPasswordExceptionInterface $e) {
return $this->redirectToRoute('app_check_email');
}
diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
index 5c473b399a15fee68bd15df2fe3652f3806ff4a4..20ccf5fdeb29a42f81a01710259da18d0e0c4b3e 100755
--- a/src/Controller/SecurityController.php
+++ b/src/Controller/SecurityController.php
@@ -10,21 +10,21 @@ use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
class SecurityController extends AbstractController
{
#[Route('/login', name:'app_login')]
- public function login(AuthenticationUtils $authenticationUtils): Response
+ public function login(AuthenticationUtils $authentication_utils): Response
{
if ($this->getUser()) {
return $this->redirectToRoute('capsule_list');
}
// get the login error if there is one
- $error = $authenticationUtils->getLastAuthenticationError();
+ $error = $authentication_utils->getLastAuthenticationError();
// last username entered by the user
- $lastUsername = $authenticationUtils->getLastUsername();
+ $last_username = $authentication_utils->getLastUsername();
return $this->render(
'security/login.html.twig',
[
- 'last_username' => $lastUsername,
+ 'last_username' => $last_username,
'error' => $error
]
);
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 92266f6d31c4eef10ea316504ed97aefe3102920..52c454c658b8d020c01beba889593f520518ba45 100755
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -15,6 +15,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class UserController extends AbstractController
{
+ public function __construct(
+ private EntityManagerInterface $entity_manager,
+ private TranslatorInterface $translator
+ ) {
+ }
+
#[Route('/profile', name:'show_profile')]
public function showProfile(): Response
{
@@ -30,11 +36,8 @@ class UserController extends AbstractController
}
#[Route('/edit_profile', name:'edit_profile')]
- public function editProfile(
- Request $request,
- EntityManagerInterface $entity_manager,
- TranslatorInterface $translator
- ): Response {
+ public function editProfile(Request $request): Response
+ {
$current_user = $this->getUser();
if (! $current_user instanceof User) {
@@ -47,28 +50,26 @@ class UserController extends AbstractController
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $entity_manager->persist($current_user);
- $entity_manager->flush();
+ $this->entity_manager->persist($current_user);
+ $this->entity_manager->flush();
$this->addFlash(
'profile_updated_success',
- $translator->trans('user.profile.updated_success')
+ $this->translator->trans('user.profile.updated_success')
);
return $this->redirectToRoute('show_profile');
}
- return $this->render('user/edit_profile.html.twig', [
- 'editUserProfileForm' => $form->createView()
+ return $this->renderForm('user/edit_profile.html.twig', [
+ 'editUserProfileForm' => $form
]);
}
#[Route('/edit_password', name:'edit_password')]
public function editPassword(
Request $request,
- UserPasswordHasherInterface $userPasswordHasher,
- EntityManagerInterface $entity_manager,
- TranslatorInterface $translator
+ UserPasswordHasherInterface $user_password_hasher,
): Response {
$form = $this->createForm(EditPasswordFormType::class);
$form->handleRequest($request);
@@ -78,23 +79,23 @@ class UserController extends AbstractController
return $this->redirectToRoute('app_logout');
}
if ($form->isSubmitted() && $form->isValid()) {
- $encodedPassword = $userPasswordHasher->hashPassword(
+ $encodedPassword = $user_password_hasher->hashPassword(
$current_user,
$form->get('plainPassword')->getData()
);
$current_user->setPassword($encodedPassword);
- $entity_manager->flush();
+ $this->entity_manager->flush();
$this->addFlash(
'profile_updated_success',
- $translator->trans('user.password.updated_success')
+ $this->translator->trans('user.password.updated_success')
);
return $this->redirectToRoute('show_profile');
}
- return $this->render('user/edit_password.html.twig', [
- 'editPasswordForm' => $form->createView()
+ return $this->renderForm('user/edit_password.html.twig', [
+ 'editPasswordForm' => $form
]);
}
}