convert session flash messages into flasher messages

composer.json

@@ -13,22 +13,12 @@
     ],
     "require": {
         "php": ">=5.3",
-        "ext-json": "*",
+        "ext-json": "*"
-        "illuminate/support": "4.0.*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.8.36",
-        "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {
             "Flasher\\": "src/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "dev"
-    "config": {
-        "platform": {
-            "php": "5.4"
-        }
-    }
 }

src/Laravel/Middleware/SessionMiddleware.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Flasher\Laravel\Middleware;
+
+use Flasher\Prime\Config\ConfigInterface;
+use Flasher\Prime\FlasherInterface;
+use Flasher\Prime\Presenter\Adapter\HtmlPresenter;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+final class SessionMiddleware
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var FlasherInterface
+     */
+    private $flasher;
+
+    /**
+     * @var HtmlPresenter
+     */
+    private $htmlPresenter;
+
+    /**
+     * @param FlasherInterface $flasher
+     * @param HtmlPresenter    $htmlPresenter
+     */
+    public function __construct(ConfigInterface $config, FlasherInterface $flasher, HtmlPresenter $htmlPresenter)
+    {
+        $this->config        = $config;
+        $this->flasher       = $flasher;
+        $this->htmlPresenter = $htmlPresenter;
+    }
+
+    /**
+     * Run the request filter.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, \Closure $next)
+    {
+        if ($request->isXmlHttpRequest() || true !== $this->config->get('auto_create_from_session')) {
+            return;
+        }
+
+        /**
+         * @var Response $response
+         */
+        $response = $next($request);
+
+        foreach ($this->typesMapping() as $alias => $type) {
+            if (false === $request->session()->has($alias)) {
+                continue;
+            }
+
+            $this->flasher->type($type, $request->session()->get($alias))->dispatch();
+        }
+
+
+        $content = $response->getContent();
+        $pos     = strripos($content, '</body>');
+        $content = substr($content, 0, $pos).$this->htmlPresenter->render().substr($content, $pos);
+        $response->setContent($content);
+
+        return $response;
+    }
+
+    /**
+     * @return array
+     */
+    private function typesMapping()
+    {
+        $mapping = array();
+
+        foreach ($this->config->get('types_mapping', array()) as $type => $aliases) {
+            if (is_int($type) && is_string($aliases)) {
+                $type = $aliases;
+            }
+
+            foreach ((array)$aliases as $alias) {
+                $mapping[$alias] = $type;
+            }
+        }
+
+        return $mapping;
+    }
+}

src/Laravel/Resources/config/config.php

@@ -6,4 +6,13 @@ return array(
     'scripts' => array(
         '/vendor/php-flasher/flasher/assets/js/flasher.js'
     ),
+
+    'auto_create_from_session' => true,
+
+    'types_mapping' => array(
+        'success' => array('success'),
+        'error'   => array('error', 'danger'),
+        'warning' => array('warning', 'alarm'),
+        'info'    => array('info', 'notice', 'alert'),
+    ),
 );

src/Laravel/ServiceProvider/Providers/Laravel.php

@@ -53,7 +53,7 @@ class Laravel implements ServiceProviderInterface
 
     public function publishAssets(FlasherServiceProvider $provider)
     {
-        $provider->publishes(array(__DIR__.'/../../public' => public_path('vendor/php-flasher/flasher/assets/js')), 'public');
+        $provider->publishes(array(__DIR__.'/../../Resources/public' => public_path('vendor/php-flasher/flasher/assets/js')), 'public');
     }
 
     public function registerServices()
@@ -146,6 +146,7 @@ class Laravel implements ServiceProviderInterface
 
         $this->app->alias('flasher', 'flasher.factory_manager');
 
+        $this->app->bind('Flasher\Prime\Config\ConfigInterface', 'flasher.config');
         $this->app->bind('Flasher\Prime\FlasherInterface', 'flasher');
         $this->app->bind('Flasher\Prime\Storage\StorageManagerInterface', 'flasher.storage_manager');
         $this->app->bind('Flasher\Prime\Renderer\RendererManagerInterface', 'flasher.renderer_manager');

src/Noty/Laravel/FlasherNotyServiceProvider.php

@@ -6,7 +6,7 @@ use Illuminate\Container\Container;
 use Illuminate\Support\ServiceProvider;
 use Flasher\Noty\Laravel\ServiceProvider\ServiceProviderManager;
 
-final class FlasherNotyfServiceProvider extends ServiceProvider
+final class FlasherNotyServiceProvider extends ServiceProvider
 {
     public function boot()
     {

src/Noty/Laravel/ServiceProvider/Providers/Laravel.php

@@ -4,7 +4,7 @@ namespace Flasher\Noty\Laravel\ServiceProvider\Providers;
 
 use Flasher\Prime\Flasher;
 use Flasher\Prime\Renderer\RendererManager;
-use Flasher\Noty\Laravel\FlasherNotyfServiceProvider;
+use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 use Flasher\Noty\Prime\NotyFactory;
 use Flasher\Noty\Prime\NotyRenderer;
 use Illuminate\Container\Container;
@@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface
         return $this->app instanceof Application;
     }
 
-    public function publishConfig(FlasherNotyfServiceProvider $provider)
+    public function publishConfig(FlasherNotyServiceProvider $provider)
     {
         $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw;
 

src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php

@@ -2,7 +2,7 @@
 
 namespace Flasher\Noty\Laravel\ServiceProvider\Providers;
 
-use Flasher\Noty\Laravel\FlasherNotyfServiceProvider;
+use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 use Illuminate\Foundation\Application;
 
 final class Laravel4 extends Laravel
@@ -12,7 +12,7 @@ final class Laravel4 extends Laravel
         return $this->app instanceof Application && 0 === strpos(Application::VERSION, '4.');
     }
 
-    public function publishConfig(FlasherNotyfServiceProvider $provider)
+    public function publishConfig(FlasherNotyServiceProvider $provider)
     {
         $provider->package('php-flasher/flasher-noty-laravel', 'flasher_noty', __DIR__.'/../../Resources');
     }

src/Noty/Laravel/ServiceProvider/Providers/Lumen.php

@@ -2,7 +2,7 @@
 
 namespace Flasher\Noty\Laravel\ServiceProvider\Providers;
 
-use Flasher\Noty\Laravel\FlasherNotyfServiceProvider;
+use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 use Laravel\Lumen\Application;
 
 final class Lumen extends Laravel
@@ -12,7 +12,7 @@ final class Lumen extends Laravel
         return $this->app instanceof Application;
     }
 
-    public function publishConfig(FlasherNotyfServiceProvider $provider)
+    public function publishConfig(FlasherNotyServiceProvider $provider)
     {
         $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw;
 

src/Noty/Laravel/ServiceProvider/Providers/ServiceProviderInterface.php

@@ -2,13 +2,13 @@
 
 namespace Flasher\Noty\Laravel\ServiceProvider\Providers;
 
-use Flasher\Noty\Laravel\FlasherNotyfServiceProvider;
+use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 
 interface ServiceProviderInterface
 {
     public function shouldBeUsed();
 
-    public function publishConfig(FlasherNotyfServiceProvider $provider);
+    public function publishConfig(FlasherNotyServiceProvider $provider);
 
     public function registerServices();
 

src/Noty/Laravel/ServiceProvider/ServiceProviderManager.php

@@ -2,7 +2,7 @@
 
 namespace Flasher\Noty\Laravel\ServiceProvider;
 
-use Flasher\Noty\Laravel\FlasherNotyfServiceProvider;
+use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 use Flasher\Noty\Laravel\ServiceProvider\Providers\ServiceProviderInterface;
 
 final class ServiceProviderManager
@@ -20,7 +20,7 @@ final class ServiceProviderManager
 
     private $notifyServiceProvider;
 
-    public function __construct(FlasherNotyfServiceProvider $notifyServiceProvider)
+    public function __construct(FlasherNotyServiceProvider $notifyServiceProvider)
     {
         $this->notifyServiceProvider = $notifyServiceProvider;
     }

src/Noty/Laravel/Tests/TestCase.php

@@ -20,7 +20,7 @@ class TestCase extends Orchestra
     {
         return array(
             'Flasher\Laravel\FlasherServiceProvider',
-            'Flasher\Noty\Laravel\FlasherNotyfServiceProvider',
+            'Flasher\Noty\Laravel\FlasherNotyServiceProvider',
         );
     }
 

src/Noty/Laravel/composer.json

@@ -51,7 +51,7 @@
     "extra": {
         "laravel": {
             "providers": [
-              "FlasherNotyfServiceProvider"
+              "Flasher\\Noty\\Laravel\\FlasherNotyServiceProvider"
             ]
         }
     },

src/Symfony/DependencyInjection/Configuration.php

@@ -37,6 +37,18 @@ final class Configuration implements ConfigurationInterface
                     ->prototype('scalar')->end()
                     ->defaultValue(array())
                 ->end()
+                ->booleanNode('auto_create_from_session')
+                    ->defaultValue(true)
+                ->end()
+                ->arrayNode('types_mapping')
+                    ->prototype('variable')->end()
+                    ->defaultValue(array(
+                          'success' => array('success'),
+                          'error'   => array('error', 'danger'),
+                          'warning' => array('warning', 'alarm'),
+                          'info'    => array('info', 'notice', 'alert'),
+                     ))
+                ->end()
                 ->arrayNode('adapters')
                     ->ignoreExtraKeys(false)
                     ->useAttributeAsKey('name')

src/Symfony/EventListener/SessionListener.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Flasher\Symfony\EventListener;
+
+use Flasher\Prime\Config\ConfigInterface;
+use Flasher\Prime\FlasherInterface;
+use Flasher\Prime\Presenter\Adapter\HtmlPresenter;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+
+final class SessionListener implements EventSubscriberInterface
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var FlasherInterface
+     */
+    private $flasher;
+
+    /**
+     * @var HtmlPresenter
+     */
+    private $htmlPresenter;
+
+    /**
+     * @param FlasherInterface $flasher
+     * @param HtmlPresenter    $htmlPresenter
+     */
+    public function __construct(ConfigInterface $config, FlasherInterface $flasher, HtmlPresenter $htmlPresenter)
+    {
+        $this->config        = $config;
+        $this->flasher       = $flasher;
+        $this->htmlPresenter = $htmlPresenter;
+    }
+
+    public function onKernelResponse(ResponseEvent $event)
+    {
+        $request = $event->getRequest();
+
+        if (!$event->isMasterRequest() || $request->isXmlHttpRequest() || true !== $this->config->get('auto_create_from_session')) {
+            return;
+        }
+
+        $response = $event->getResponse();
+
+        $mapping = $this->typesMapping();
+
+        foreach ($request->getSession()->getFlashBag()->all() as $type => $messages) {
+            if (!isset($mapping[$type])) {
+                continue;
+            }
+
+            foreach ($messages as $message) {
+                $this->flasher->type($mapping[$type], $message)->dispatch();
+            }
+        }
+
+        $content = $response->getContent();
+        $pos     = strripos($content, '</body>');
+        $content = substr($content, 0, $pos).$this->htmlPresenter->render().substr($content, $pos);
+        $response->setContent($content);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'kernel.response' => 'onKernelResponse'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    private function typesMapping()
+    {
+        $mapping = array();
+
+        foreach ($this->config->get('types_mapping', array()) as $type => $aliases) {
+            if (is_int($type) && is_string($aliases)) {
+                $type = $aliases;
+            }
+
+            foreach ((array) $aliases as $alias) {
+                $mapping[$alias] = $type;
+            }
+        }
+
+        return $mapping;
+    }
+}

src/Symfony/Resources/config/config.yaml

@@ -144,6 +144,15 @@ services:
         tags:
             - { name: 'twig.extension' }
 
+    flasher.session_listener:
+        class: Flasher\Symfony\EventListener\SessionListener
+        arguments:
+            - '@flasher.config'
+            - '@flasher'
+            - '@flasher.presenter.html'
+        tags:
+            - { name: 'kernel.event_subscriber' }
+
     Flasher\Prime\Config\Config: '@flasher.config'
     Flasher\Prime\Flasher: '@flasher'
     Flasher\Prime\Presenter\PresenterManager: '@flasher.presenter_manager'

src/Toastr/Laravel/Resources/config/config.php

@@ -35,7 +35,7 @@ return array(
         'onHidden'          => null,
         'onShown'           => null,
         'positionClass'     => 'toast-top-right',
-        'preventDuplicates' => true,
+        'preventDuplicates' => false,
         'progressBar'       => true,
         'progressClass'     => 'toast-progress',
         'rtl'               => false,