Added a flashmessage listener

DependencyInjection/Configuration.php

@@ -39,6 +39,14 @@ public function getConfigTreeBuilder()
                 ->scalarNode('spam_detector')->defaultValue('fos_message.noop_spam_detector')->cannotBeEmpty()->end()
                 ->scalarNode('twig_extension')->defaultValue('fos_message.twig_extension.default')->cannotBeEmpty()->end()
                 ->scalarNode('user_transformer')->defaultValue('fos_user.user_to_username_transformer')->cannotBeEmpty()->end()
+                ->arrayNode('flash_messages')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->booleanNode('show')->defaultValue(false)->end()
+                        ->scalarNode('flash_key')->defaultNull()->cannotBeEmpty()->end()
+                        ->scalarNode('service')->defaultValue('fos_message.flash_listener.default')->cannotBeEmpty()->end()
+                    ->end()
+                ->end()    
                 ->arrayNode('search')
                     ->addDefaultsIfNotSet()
                     ->children()

DependencyInjection/FOSMessageExtension.php

@@ -65,5 +65,16 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->getDefinition('fos_message.recipients_data_transformer')
             ->replaceArgument(0, new Reference($config['user_transformer']));
+
+        if($config['flash_messages']['show']) 
+        {
+             $loader->load('flash.xml');
+             $container->setAlias('fos_message.flash_listener', $config['flash_messages']['service']);
+             if($config['flash_messages']['flash_key'] !== null)
+             {
+                 $container->getDefinition('fos_message.flash_listener.default')
+                     ->replaceArgument(2, $config['flash_messages']['flash_key']);
+             }
+        }
     }
 }

EventListener/FlashListener.php

@@ -0,0 +1,89 @@
+<?php
+namespace FOS\MessageBundle\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use FOS\MessageBundle\Event\FOSMessageEvents;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * The flash listener adds flash messages when certain message events occur
+ *
+ * @author Michiel Boeckaert <[email protected]>
+ */
+class FlashListener implements EventSubscriberInterface
+{
+    private static $successMessages = array(
+        FOSMessageEvents::POST_SEND => 'flash_post_send_success',
+        FOSMessageEvents::POST_DELETE => 'flash_thread_delete_success',
+        FOSMessageEvents::POST_UNDELETE => 'flash_thread_undelete_success',
+    );
+
+    /**
+     * Translator
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    /**
+     * Session
+     *
+     * @var Session
+     */
+    protected $session;
+
+    /**
+     * Constructor.
+     *
+     * @param Session             $session    The current session
+     * @param TranslatorInterface $translator A translator instance
+     * @param string              $key        An optional flashBag key which overwrites the default key
+     */
+    public function __construct(Session $session, TranslatorInterface $translator, $key = '')
+    {
+        $this->session = $session;
+        $this->translator = $translator;
+        if (empty($key)) {
+            $this->key = 'success';
+        } else {
+            $this->key = $key;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+         return array(
+             FOSMessageEvents::POST_SEND => 'addSuccessFlash',
+             FOSMessageEvents::POST_DELETE => 'addSuccessFlash',
+             FOSMessageEvents::POST_UNDELETE => 'addSuccessFlash'
+         );
+    }
+
+    /**
+     * Adds a flashmessage to the session
+     *
+     * @param Event $event The current event
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addSuccessFlash(Event $event)
+    {
+        $eventName = $event->getname();
+
+         if (!isset(self::$successMessages[$eventName])) {
+             throw new \InvalidArgumentException('This event does not correspond to a known flash message');
+        }
+
+        $this->session->getFlashBag()->add($this->key, $this->trans(self::$successMessages[$eventName]));
+    }
+
+    private function trans($message, array $params = array())
+    {
+       return $this->translator->trans($message, $params, 'FOSMessageBundle');
+    }
+}

Resources/config/flash.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+
+         <service id="fos_message.flash_listener.default" class="FOS\MessageBundle\EventListener\FlashListener">
+            <argument type="service" id="session" />
+            <argument type="service" id="translator" />
+            <argument></argument>
+            <tag name="kernel.event_subscriber" />
+        </service>
+
+    </services>
+
+</container>

Resources/translations/FOSMessageBundle.en.yml

@@ -22,3 +22,7 @@ by:             By %sender%
 no_thread:      There is no thread to show
 delete:         Delete
 undelete:       Undelete
+
+flash_post_send_success: Your message has been sent
+flash_thread_delete_success: The thread has been deleted
+flash_thread_undelete_success: The thread has been restored

Resources/translations/FOSMessageBundle.nl.yml

@@ -21,3 +21,7 @@ on:             Op %date%
 by:             Door %sender%
 no_thread:      Geen onderwerpen gevonden
 delete:         Verwijder
+
+flash_post_send_success: Jouw bericht werd succesvol verzonden
+flash_thread_delete_success: Onderwerp werd verwijderd
+flash_thread_undelete_success: Onderwerp niet langer verwijderd

Tests/EventListener/FlashListenerTest.php

@@ -0,0 +1,85 @@
+<?php
+namespace FOS\MessageBundle\Tests\EventListener;
+
+use FOS\MessageBundle\EventListener\FlashListener;
+use FOS\MessageBundle\Event\FOSMessageEvents;
+
+/**
+ * Test for the Flash listener
+ * 
+ * @author Michiel Boeckaert <[email protected]>
+ */
+class FlashListenerTest extends \PHPUnit_Framework_TestCase
+{
+    private $listener;
+    private $session;
+    private $translator;
+    private $event;   
+
+    public function setUp() 
+    {
+        $this->event = $this->getMock('Symfony\Component\EventDispatcher\Event');
+
+        //if we use the interface getflashbag returns an error...
+        $this->session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+        $this->listener = new FlashListener($this->session, $this->translator);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage This event does not correspond to a known flash message
+     */
+    public function testAddFlashWithNonSupportedEvent() 
+    {
+        $this->event->expects($this->once())->method('getName')->will($this->returnValue('foo'));
+        $this->listener->addSuccessFlash($this->event);        
+    }
+
+    public function testAddFlashOnValidEventWithDefaultKey()
+    {
+        $flashbagMock = $this->getMock('Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface');
+
+        $this->event->expects($this->once())->method('getName')->will($this->returnValue(FOSMessageEvents::POST_SEND));
+
+        $this->translator->expects($this->once())
+            ->method('trans')
+            ->with('flash_post_send_success', array(), 'FOSMessageBundle')
+            ->will($this->returnValue('translatedString'));
+
+        $this->session->expects($this->once())
+            ->method('getFlashBag')
+            ->will($this->returnValue($flashbagMock));
+
+        $flashbagMock->expects($this->once())
+            ->method('add')
+            ->with('success', 'translatedString');
+
+        $this->listener->addSuccessFlash($this->event);
+    }
+
+    public function testAddFlashOnValidEventWithCustomKey() 
+    {
+        $customKey = 'message_info';
+        $flashbagMock = $this->getMock('Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface');
+
+        $this->listener = new FlashListener($this->session, $this->translator, $customKey);
+
+        $this->event->expects($this->once())->method('getName')->will($this->returnValue(FOSMessageEvents::POST_SEND));
+
+        $this->translator->expects($this->once())
+            ->method('trans')
+            ->with('flash_post_send_success', array(), 'FOSMessageBundle')
+            ->will($this->returnValue('translatedString'));
+
+        $this->session->expects($this->once())
+            ->method('getFlashBag')
+            ->will($this->returnValue($flashbagMock));
+
+        $flashbagMock->expects($this->once())
+            ->method('add')
+            ->with($customKey, 'translatedString');
+
+        $this->listener->addSuccessFlash($this->event);        
+    }    
+}