kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Make UserController compatible with both Symfony 3.4 and 4.0

Browse source
This commit is contained in:
Kamil Kokot 2018-04-25 11:56:35 +02:00
parent d05789698e
commit bd097a4696
No known key found for this signature in database
GPG key ID: 7BD76F7054D93C89
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UPGRADE-1.2.md
View file

@ -1,5 +1,8 @@
# UPGRADE FROM 1.1 to 1.2
* __BC BREAK:__ `Sylius\Bundle\UserBundle\Controller\UserController`'s method `addFlash` has been renamed to
`addTranslatedFlash` with added scalar typehints for compatibility with both Symfony 3.4 and Symfony 4.0.
* The deprecated form mapping feature in SonataCoreBundle has been disabled in the app configuration included from SyliusCoreBundle.
If you depend on the feature in your application, you will need to make the necessary changes. Refer to
https://github.com/sonata-project/SonataCoreBundle/pull/462 for more information.
https://github.com/sonata-project/SonataCoreBundle/pull/462 for more information.

20
src/Sylius/Bundle/UserBundle/Controller/UserController.php
View file

@ -157,7 +157,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create($configuration, Response::HTTP_BAD_REQUEST));
}
$this->addFlash('error', 'sylius.user.verify_email_by_invalid_token');
$this->addTranslatedFlash('error', 'sylius.user.verify_email_by_invalid_token');
return $this->redirectToRoute($redirectRoute);
}
@ -178,7 +178,7 @@ class UserController extends ResourceController
}
$flashMessage = $this->getSyliusAttribute($request, 'flash', 'sylius.user.verify_email');
$this->addFlash('success', $flashMessage);
$this->addTranslatedFlash('success', $flashMessage);
return $response;
}
@ -199,7 +199,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create($configuration, Response::HTTP_UNAUTHORIZED));
}
$this->addFlash('notice', 'sylius.user.verify_no_user');
$this->addTranslatedFlash('notice', 'sylius.user.verify_no_user');
return $this->redirectHandler->redirectToRoute($configuration, $redirectRoute);
}
@ -209,7 +209,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create($configuration, Response::HTTP_BAD_REQUEST));
}
$this->addFlash('notice', 'sylius.user.verify_verified_email');
$this->addTranslatedFlash('notice', 'sylius.user.verify_verified_email');
return $this->redirectHandler->redirectToRoute($configuration, $redirectRoute);
}
@ -226,7 +226,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create(null, Response::HTTP_NO_CONTENT));
}
$this->addFlash('success', 'sylius.user.verify_email_request');
$this->addTranslatedFlash('success', 'sylius.user.verify_email_request');
return $this->redirectHandler->redirectToRoute($configuration, $redirectRoute);
}
@ -260,7 +260,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create(null, Response::HTTP_NO_CONTENT));
}
$this->addFlash('success', 'sylius.user.reset_password_request');
$this->addTranslatedFlash('success', 'sylius.user.reset_password_request');
$redirectRoute = $this->getSyliusAttribute($request, 'redirect', null);
Assert::notNull($redirectRoute, 'Redirect is not configured.');
@ -290,7 +290,7 @@ class UserController extends ResourceController
/**
* {@inheritdoc}
*/
protected function addFlash($type, $message): void
protected function addTranslatedFlash(string $type, string $message): void
{
$translator = $this->container->get('translator');
$this->container->get('session')->getFlashBag()->add($type, $translator->trans($message, [], 'flashes'));
@ -333,7 +333,7 @@ class UserController extends ResourceController
return $this->viewHandler->handle($configuration, View::create($user, Response::HTTP_BAD_REQUEST));
}
$this->addFlash('error', 'sylius.user.expire_password_reset_token');
$this->addTranslatedFlash('error', 'sylius.user.expire_password_reset_token');
$redirectRouteName = $this->getSyliusAttribute($request, 'redirect', null);
Assert::notNull($redirectRouteName, 'Redirect is not configured.');
@ -385,7 +385,7 @@ class UserController extends ResourceController
$dispatcher->dispatch(UserEvents::PRE_PASSWORD_RESET, new GenericEvent($user));
$this->manager->flush();
$this->addFlash('success', 'sylius.user.reset_password');
$this->addTranslatedFlash('success', 'sylius.user.reset_password');
$dispatcher->dispatch(UserEvents::POST_PASSWORD_RESET, new GenericEvent($user));
@ -419,7 +419,7 @@ class UserController extends ResourceController
$dispatcher->dispatch(UserEvents::PRE_PASSWORD_CHANGE, new GenericEvent($user));
$this->manager->flush();
$this->addFlash('success', 'sylius.user.change_password');
$this->addTranslatedFlash('success', 'sylius.user.change_password');
$dispatcher->dispatch(UserEvents::POST_PASSWORD_CHANGE, new GenericEvent($user));