Fix flash messages

app/config/config.yml

@@ -71,3 +71,6 @@ fos_user:
 
 nelmio_solarium:
     adapter: ~
+
+parameters:
+    session.flashbag.class: Symfony\Component\HttpFoundation\Session\Flash\FlashBag

src/Packagist/WebBundle/Controller/PackageController.php

@@ -29,8 +29,8 @@ class PackageController extends Controller
      */
     public function editAction(Request $req, $name)
     {
-        $packages = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-        $package = $packages->findOneByName($name);
+        $packageRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $package = $packageRepo->findOneByName($name);
 
         if (!$package) {
             throw $this->createNotFoundException("The requested package, $name, could not be found.");
@@ -45,7 +45,7 @@ class PackageController extends Controller
             ->getForm();
 
         if ($req->isMethod("POST")) {
-            $package->setEntityRepository($packages);
+            $package->setEntityRepository($packageRepo);
 
             $form->bindRequest($req);
 
@@ -57,7 +57,7 @@ class PackageController extends Controller
                 $em->persist($package);
                 $em->flush();
 
-                $this->get("session")->setFlash("notice", "Changes saved.");
+                $this->get("session")->getFlashBag()->set("success", "Changes saved.");
 
                 return $this->redirect(
                     $this->generateUrl("view_package", array("name" => $package->getName()))

src/Packagist/WebBundle/Controller/WebController.php

@@ -187,12 +187,12 @@ class WebController extends Controller
                     $em->persist($package);
                     $em->flush();
 
-                    $this->get('session')->setFlash('success', $package->getName().' has been added to the package list, the repository will now be crawled.');
+                    $this->get('session')->getFlashBag()->set('success', $package->getName().' has been added to the package list, the repository will now be crawled.');
 
                     return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
                 } catch (\Exception $e) {
                     $this->get('logger')->crit($e->getMessage(), array('exception', $e));
-                    $this->get('session')->setFlash('error', $package->getName().' could not be saved.');
+                    $this->get('session')->getFlashBag()->set('error', $package->getName().' could not be saved.');
                 }
             }
         }
@@ -454,14 +454,14 @@ class WebController extends Controller
                         $em->persist($package);
                         $em->flush();
 
-                        $this->get('session')->setFlash('success', $user->getUsername().' is now a '.$package->getName().' maintainer.');
+                        $this->get('session')->getFlashBag()->set('success', $user->getUsername().' is now a '.$package->getName().' maintainer.');
 
                         return new RedirectResponse($this->generateUrl('view_package', array('name' => $package->getName())));
                     }
-                    $this->get('session')->setFlash('error', 'The user could not be found.');
+                    $this->get('session')->getFlashBag()->set('error', 'The user could not be found.');
                 } catch (\Exception $e) {
                     $this->get('logger')->crit($e->getMessage(), array('exception', $e));
-                    $this->get('session')->setFlash('error', 'The maintainer could not be added.');
+                    $this->get('session')->getFlashBag()->set('error', 'The maintainer could not be added.');
                 }
             }
         }

src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -50,15 +50,12 @@
             </header>
 
             <div class="main" role="main">
-                {% for flashMessage in app.session.flashbag.get('success') %}
-                    <div class="flash-message success">
-                        <p>{{ flashMessage }}</p>
-                    </div>
-                {% endfor %}
-                {% for flashMessage in app.session.flashbag.get('error') %}
-                    <div class="flash-message error">
-                        <p>{{ flashMessage }}</p>
-                    </div>
+                {% for type, flashMessages in app.session.flashbag.all() %}
+                    {% for flashMessage in flashMessages %}
+                        <div class="flash-message {{ type }}">
+                            <p>{{ flashMessage }}</p>
+                        </div>
+                    {% endfor %}
                 {% endfor %}
 
                 {% block search %}