Merge pull request #24 from Extendas/version-update

Version update

Author: Tayfun74

DependencyInjection/Configuration.php

@@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('ali_datatable');
+        $treeBuilder = new TreeBuilder('ali_datatable');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

EventListener/DatatableListener.php

@@ -14,7 +14,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -32,10 +32,10 @@ class DatatableListener implements EventSubscriberInterface
     /**
      * On kernel response event
      * 
-     * @param FilterResponseEvent $event
+     * @param ResponseEvent $event
      * @return void|null
      */
-    public function onKernelResponse(FilterResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event)
     {
         $response = $event->getResponse();
         $request  = $event->getRequest();
@@ -58,32 +58,39 @@ public function onKernelResponse(FilterResponseEvent $event)
     protected function _injectDatatableScript(Response $response, Request $request)
     {
         $content  = $response->getContent();
+        if (!is_string($content))
+        {
+            return;
+        }
         $pos_body = strripos($content, '</body>');
         if (!$pos_body)
         {
             return;
         }
         $session       = $request->getSession();
-        $dom           = '<script id="alidatatable-scripts" type="text/javascript">';
+        $dom           = '<script id="alidatatable-scripts" type="text/javascript" nonce="CQp8HV9whIqW2xhqCXCJNWj0K1DvzmFC">';
         $pos_container = strripos($content, 'alidatatable-scripts');
-        $sess_dta      = $session->get('datatable',array());
+        $sess_dta      = $session->get('datatable', []);
         $dta_script    = null;
         if ($sess_dta)
         {
-            array_walk($sess_dta, function(&$part, &$key) {
-                $part = trim(preg_replace('/\s\s+/', ' ', $part));
+            array_walk($sess_dta, function($part, $key) use (&$sess_dta) {
+                $sess_dta[$key] = trim(preg_replace('/\s\s+/', ' ', $part));
             });
             $dta_script = implode("\n", $sess_dta);
         }
-        $session->set('datatable', array());
+        $session->set('datatable', []);
         if (!$pos_container)
         {
             $dta_container = $dom;
             $content       = substr_replace($content, $dta_container . '</script>', $pos_body, 0);
             $response->setContent($content);
         }
         $pos_dta = strripos($content, $dom);
-        $content = substr_replace($content, $dta_script, $pos_dta + strlen($dom), 0);
+        if ($dta_script)
+        {
+            $content = substr_replace($content, $dta_script, $pos_dta + strlen($dom), 0);
+        }
         $response->setContent($content);
     }
 

Resources/views/Blocks/entity.html.twig

@@ -1,7 +1,7 @@
-{% spaceless %}
+{% apply spaceless %}
     {% if single_entity is defined and single_entity is not null and path_name is not defined %}
         {{ single_entity }}
     {% elseif single_entity is defined and single_entity is not null %}
         <a data-id="{{ single_entity.id }}" data-title="{{ single_entity }}" data-url="{{ path(path_name, {'id': single_entity.id}) }}" href="{{ path(path_name, {'id': single_entity.id}) }}">{{ single_entity }}</a>
     {% endif %}
-{% endspaceless %}
+{% endapply %}

Resources/views/Renderers/_entity.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
     {% if entity is not defined %}
         missing parameters for rendering entity ({% if entity is not defined %}entity{% endif %})
     {% else %}
@@ -17,4 +17,4 @@
             {% endembed %}
         {% endif %}
     {% endif %}
-{% endspaceless %}
+{% endapply %}