resolved conflict
This commit is contained in:
parent
67433813e1
commit
bf5ccb0ae6
|
@ -28,18 +28,18 @@ UPGRADE FROM 2.0 to 2.1
|
|||
|
||||
Retrieving the locale from a Twig template:
|
||||
|
||||
Before: {{ app.request.session.locale }} or {{ app.session.locale }}
|
||||
After: {{ app.request.locale }}
|
||||
Before: `{{ app.request.session.locale }}` or `{{ app.session.locale }}`
|
||||
After: `{{ app.request.locale }}`
|
||||
|
||||
Retrieving the locale from a PHP template:
|
||||
|
||||
Before: $view['session']->getLocale()
|
||||
After: $view['request']->getLocale()
|
||||
Before: `$view['session']->getLocale()`
|
||||
After: `$view['request']->getLocale()`
|
||||
|
||||
Retrieving the locale from PHP code:
|
||||
|
||||
Before: $session->getLocale()
|
||||
After: $request->getLocale()
|
||||
Before: `$session->getLocale()`
|
||||
After: `$request->getLocale()`
|
||||
|
||||
* Method `equals` of `Symfony\Component\Security\Core\User\UserInterface` has
|
||||
moved to `Symfony\Component\Security\Core\User\EquatableInterface`.
|
||||
|
|
Reference in New Issue