diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflict

This commit is contained in:
Tobias Schultze 2012-01-17 10:53:31 +01:00
parent 67433813e1
commit bf5ccb0ae6
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UPGRADE-2.1.md
View File

@ -28,18 +28,18 @@ UPGRADE FROM 2.0 to 2.1
Retrieving the locale from a Twig template: Retrieving the locale from a Twig template:
Before: {{ app.request.session.locale }} or {{ app.session.locale }} Before: `{{ app.request.session.locale }}` or `{{ app.session.locale }}`
After: {{ app.request.locale }} After: `{{ app.request.locale }}`
Retrieving the locale from a PHP template: Retrieving the locale from a PHP template:
Before: $view['session']->getLocale() Before: `$view['session']->getLocale()`
After: $view['request']->getLocale() After: `$view['request']->getLocale()`
Retrieving the locale from PHP code: Retrieving the locale from PHP code:
Before: $session->getLocale() Before: `$session->getLocale()`
After: $request->getLocale() After: `$request->getLocale()`
* Method `equals` of `Symfony\Component\Security\Core\User\UserInterface` has * Method `equals` of `Symfony\Component\Security\Core\User\UserInterface` has
moved to `Symfony\Component\Security\Core\User\EquatableInterface`. moved to `Symfony\Component\Security\Core\User\EquatableInterface`.