From 7fe9eef04747be115c7372eb4f0d3e2795ade1e7 Mon Sep 17 00:00:00 2001
From: Leny BERNARD <leny@troopers.email>
Date: Thu, 20 Oct 2016 00:44:35 +0200
Subject: [PATCH] get back twig extension to continue to render alerts with {{
 app.session|alertify|raw }}

---
 Handler/AlertifySessionHandler.php   |  2 +-
 Resources/config/services.xml        | 11 +++++
 Resources/views/pushjs.html.twig     |  1 -
 Twig/Extension/AlertifyExtension.php | 66 ++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 Twig/Extension/AlertifyExtension.php

diff --git a/Handler/AlertifySessionHandler.php b/Handler/AlertifySessionHandler.php
index 5cd914f..040ab43 100644
--- a/Handler/AlertifySessionHandler.php
+++ b/Handler/AlertifySessionHandler.php
@@ -78,7 +78,7 @@ public function handle($session)
      *
      * @return array
      **/
-    public function getDefaultParametersFromContext($context = null)
+    protected function getDefaultParametersFromContext($context = null)
     {
         if (count($this->defaultParameters['contexts'])) {
             //If context is not given, just take the default one
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index dd737de..83515d3 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -4,6 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
+        <parameter key="alertify.twig.extension.class">Troopers\AlertifyBundle\Twig\Extension\AlertifyExtension</parameter>
         <parameter key="alertify.handler.session.class">Troopers\AlertifyBundle\Handler\AlertifySessionHandler</parameter>
         <parameter key="alertify.helper.class">Troopers\AlertifyBundle\Helper\AlertifyHelper</parameter>
         <parameter key="alertify.event_listener">Troopers\AlertifyBundle\EventListener\AlertifyListener</parameter>
@@ -17,5 +18,15 @@
             <argument type="service" id="twig" />
             <argument>%troopers_alertify%</argument>
         </service>
+        <service id="troopers_alertifybundle.event_listener" class="%alertify.event_listener%">
+            <tag name="kernel.event_subscriber" />
+            <argument type="service" id="session" />
+            <argument type="service" id="troopers_alertifybundle.session_handler" />
+        </service>
+        <service id="troopers_alertifybundle.twig.extension" class="%alertify.twig.extension.class%">
+            <tag name="twig.extension" />
+            <argument type="service" id="troopers_alertifybundle.session_handler" />
+        </service>
+
     </services>
 </container>
diff --git a/Resources/views/pushjs.html.twig b/Resources/views/pushjs.html.twig
index d53c1d2..972230b 100644
--- a/Resources/views/pushjs.html.twig
+++ b/Resources/views/pushjs.html.twig
@@ -1,4 +1,3 @@
-{{ dump(options) }}
 <script type="text/javascript">
     Push.create('{{ title|default(body)|trans({}, translationDomain|default('messages'))|striptags }}', {
         body: '{{ title|default(false) ? body|trans({}, translationDomain|default('messages'))|striptags : null }}',
diff --git a/Twig/Extension/AlertifyExtension.php b/Twig/Extension/AlertifyExtension.php
new file mode 100644
index 0000000..089d6c2
--- /dev/null
+++ b/Twig/Extension/AlertifyExtension.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Troopers\AlertifyBundle\Twig\Extension;
+
+use Symfony\Component\HttpFoundation\Session\Session;
+use Troopers\AlertifyBundle\Handler\AlertifySessionHandler;
+
+/**
+ * AlertifyExtension.
+ */
+class AlertifyExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
+{
+    /**
+     * @var AlertifySessionHandler
+     */
+    private $alertifySessionHandler;
+
+    /**
+     * AlertifyExtension constructor.
+     *
+     * @param AlertifySessionHandler $alertifySessionHandler
+     */
+    public function __construct(AlertifySessionHandler $alertifySessionHandler)
+    {
+        $this->alertifySessionHandler = $alertifySessionHandler;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function initRuntime(\Twig_Environment $environment)
+    {
+        $this->environment = $environment;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'alertify';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilters()
+    {
+        return [
+            new \Twig_SimpleFilter('alertify', [$this, 'alertifyFilter'], ['needs_environment' => true, 'is_safe' => ['html']]),
+        ];
+    }
+
+    /**
+     * Alertify filter.
+     *
+     * @param \Twig_Environment $environment
+     * @param Session           $session
+     *
+     * @return string
+     */
+    public function alertifyFilter($environment, Session $session)
+    {
+        return $this->alertifySessionHandler->handle($session);
+    }
+}