Changed the flash message handling to use the non-deprecated api

This fixes the compatibility with symfony 2.3
jibay · May 25, 2013 · 90cb9c1 · 90cb9c1
1 parent 6b4e4a2
commit 90cb9c1
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 14 deletions.
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>

diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * CreateUserCommand

diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Matthieu Bontemps <matthieu@knplabs.com>

diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Model\User;
 
 /**
  * @author Antoine Hérault <antoine.herault@gmail.com>

diff --git a/Controller/ChangePasswordController.php b/Controller/ChangePasswordController.php
@@ -68,6 +68,6 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function setFlash($action, $value)
     {
-        $this->container->get('session')->setFlash($action, $value);
+        $this->container->get('session')->getFlashBag()->set($action, $value);
     }
 }
diff --git a/Controller/GroupController.php b/Controller/GroupController.php
@@ -133,6 +133,6 @@ protected function getEngine()
      */
     protected function setFlash($action, $value)
     {
-        $this->container->get('session')->setFlash($action, $value);
+        $this->container->get('session')->getFlashBag()->set($action, $value);
     }
 }
diff --git a/Controller/ProfileController.php b/Controller/ProfileController.php
@@ -80,6 +80,6 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function setFlash($action, $value)
     {
-        $this->container->get('session')->setFlash($action, $value);
+        $this->container->get('session')->getFlashBag()->set($action, $value);
     }
 }
diff --git a/Controller/RegistrationController.php b/Controller/RegistrationController.php
@@ -142,7 +142,7 @@ protected function authenticateUser(UserInterface $user, Response $response)
      */
     protected function setFlash($action, $value)
     {
-        $this->container->get('session')->setFlash($action, $value);
+        $this->container->get('session')->getFlashBag()->set($action, $value);
     }
 
     protected function getEngine()

diff --git a/Controller/ResettingController.php b/Controller/ResettingController.php
@@ -176,7 +176,7 @@ protected function getObfuscatedEmail(UserInterface $user)
      */
     protected function setFlash($action, $value)
     {
-        $this->container->get('session')->setFlash($action, $value);
+        $this->container->get('session')->getFlashBag()->set($action, $value);
     }
 
     protected function getEngine()

diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php
@@ -21,7 +21,7 @@ public function loginAction()
         $request = $this->container->get('request');
         /* @var $request \Symfony\Component\HttpFoundation\Request */
         $session = $request->getSession();
-        /* @var $session \Symfony\Component\HttpFoundation\Session */
+        /* @var $session \Symfony\Component\HttpFoundation\Session\Session */
 
         // get the error if any (works with forward and redirect -- see below)
         if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
@@ -15,10 +15,12 @@
             {% endif %}
         </div>
 
-        {% for key, message in app.session.getFlashes() %}
-        <div class="{{ key }}">
-            {{ message|trans({}, 'FOSUserBundle') }}
-        </div>
+        {% for type, messages in app.session.flashBag.all %}
+            {% for message in messages %}
+                <div class="{{ type }}">
+                    {{ message|trans({}, 'FOSUserBundle') }}
+                </div>
+            {% endfor %}
         {% endfor %}
 
         <div>