Symfony 5 support

.travis.yml

@@ -1,25 +1,23 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
+  - 7.2
+  - 7.3
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.2
       env: |
-        SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: |
-        SYMFONY_VERSION=2.8.*
-    - php: 7.1
+        SYMFONY_VERSION=^3.0
+    - php: 7.2
       env: |
         SYMFONY_VERSION=^4.0
 
 before_install:
+  - echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - |
     if [ "${SYMFONY_VERSION}" != "" ]; then
-      packages="form dependency-injection config http-foundation http-kernel options-resolver security serializer"
+      packages="form dependency-injection config http-foundation http-kernel options-resolver security-guard serializer"
       devpackages="framework-bundle browser-kit templating expression-language"
       for package in $packages
         do
@@ -31,10 +29,6 @@ before_install:
         done
     fi;
 
-
-before_script:
-  - echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-
 install:
   - travis_retry composer self-update
   - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
@@ -46,4 +40,4 @@ script:
   - php vendor/bin/phpunit -c phpunit.xml.dist
 
 after_success:
-  - php vendor/bin/coveralls
+  - php vendor/bin/php-coveralls

DependencyInjection/Configuration.php

@@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('apy_data_grid');
+        $treeBuilder = new TreeBuilder('apy_data_grid');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -32,7 +32,7 @@ public function getConfigTreeBuilder()
                     ->prototype('scalar')->end()
                 ->end()
                 ->booleanNode('persistence')->defaultFalse()->end()
-                ->scalarNode('theme')->defaultValue('APYDataGridBundle::blocks.html.twig')->end()
+                ->scalarNode('theme')->defaultValue('@APYDataGrid/blocks.html.twig')->end()
                 ->scalarNode('no_data_message')->defaultValue('No data')->end()
                 ->scalarNode('no_result_message')->defaultValue('No result')->end()
                 ->scalarNode('actions_columns_size')->defaultValue(-1)->end()

Grid/Column/Column.php

@@ -687,7 +687,7 @@ public function getFilters($source)
     {
         $filters = [];
 
-        if ($this->hasOperator($this->data['operator'])) {
+        if (isset($this->data['operator']) && $this->hasOperator($this->data['operator'])) {
             if ($this instanceof ArrayColumn && in_array($this->data['operator'], [self::OPERATOR_EQ, self::OPERATOR_NEQ])) {
                 $filters[] = new Filter($this->data['operator'], $this->data['from']);
             } else {

Grid/Export/Export.php

@@ -19,7 +19,7 @@
 
 abstract class Export implements ExportInterface, ContainerAwareInterface
 {
-    const DEFAULT_TEMPLATE = 'APYDataGridBundle::blocks.html.twig';
+    const DEFAULT_TEMPLATE = '@APYDataGrid/blocks.html.twig';
 
     protected $title;
 
@@ -459,7 +459,7 @@ protected function getTemplatesFromString($theme)
         $templates = [];
 
         $template = $this->twig->loadTemplate($theme);
-        while ($template instanceof \Twig_Template) {
+        while ($template instanceof TemplateWrapper) {
             $templates[] = $template;
             $template = $template->getParent([]);
         }

Grid/Grid.php

@@ -26,6 +26,7 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Twig\TemplateWrapper;
 
 class Grid implements GridInterface
 {
@@ -359,8 +360,10 @@ public function initialize()
         $this->setPersistence($config->isPersisted());
 
         // Route parameters
-        $routeParameters = $config->getRouteParameters();
-        if (!empty($routeParameters)) {
+        $routeParameters = [];
+        $parameters = $config->getRouteParameters();
+        if (!empty($parameters)) {
+            $routeParameters = $parameters;
             foreach ($routeParameters as $parameter => $value) {
                 $this->setRouteParameter($parameter, $value);
             }
@@ -1135,7 +1138,7 @@ protected function set($key, $data)
 
     protected function saveSession()
     {
-        if (!empty($this->sessionData)) {
+        if (!empty($this->sessionData) && !empty($this->hash)) {
             $this->session->set($this->hash, $this->sessionData);
         }
     }
@@ -1395,12 +1398,11 @@ public function getRowActions()
     public function setTemplate($template)
     {
         if ($template !== null) {
-            if ($template instanceof \Twig_Template) {
+            if ($template instanceof TemplateWrapper) {
                 $template = '__SELF__' . $template->getTemplateName();
             } elseif (!is_string($template)) {
                 throw new \Exception(self::TWIG_TEMPLATE_LOAD_EX_MSG);
             }
-
             $this->set(self::REQUEST_QUERY_TEMPLATE, $template);
             $this->saveSession();
         }
@@ -2147,7 +2149,7 @@ public function getGridResponse($param1 = null, $param2 = null, Response $respon
             if ($view === null) {
                 return $parameters;
             } else {
-                return $this->container->get('templating')->renderResponse($view, $parameters, $response);
+                return new Response($this->container->get('twig')->render($view, $parameters, $response));
             }
         }
     }

Grid/GridManager.php

@@ -193,7 +193,15 @@ public function getGridManagerResponse($param1 = null, $param2 = null, Response
                 return $parameters;
             }
 
-            return $this->container->get('templating')->renderResponse($view, $parameters, $response);
+            $content = $this->container->get('twig')->render($view, $parameters);
+
+            if (null === $response) {
+                 $response = new Response();
+            }
+
+            $response->setContent($content);
+
+            return $response;
         }
     }
 

README.md

@@ -1,3 +1,5 @@
+New version for Symfony 5.2.3 an changes for PHP 7.4
+
 Datagrid for Symfony inspired by Zfdatagrid and Magento Grid.  
 This bundle was initiated by Stanislav Turza (Sorien).
 

Resources/config/services.xml

@@ -41,6 +41,9 @@
                 <argument>%apy_data_grid.actions_columns_title%</argument>
             </call>
         </service>
+
+        <service id="%grid.class%" alias="grid" public="true">
+        </service>
 
         <service id="grid.manager" class="%grid.manager.class%">
             <argument type="service" id="service_container" />

Resources/views/blocks.html.twig

@@ -43,7 +43,7 @@
 {% block grid_no_data %}<p class="no_data">{{ grid.noDataMessage|default('No data')|trans|raw }}</p>{% endblock grid_no_data %}
 {# --------------------------------------------------- grid_no_result ------------------------------------------------- #}
 {% block grid_no_result %}
-{% spaceless %}
+{% apply spaceless %}
 {% set nbColumns = 0 %}
 {% for column in grid.columns %}
     {% if column.visible(grid.isReadyForExport) %}
@@ -53,7 +53,7 @@
 <tr class="grid-row-cells">
     <td class="last-column last-row" colspan="{{ nbColumns }}" style="text-align: center;">{{ grid.noResultMessage|default('No result')|trans|raw }}</td>
 </tr>
-{% endspaceless %}
+{% endapply %}
 {% endblock grid_no_result %}
 {# --------------------------------------------------- grid_titles -------------------------------------------------- #}
 {% block grid_titles %}
@@ -62,7 +62,7 @@
         {% set translation_domain = column.translationDomain %}
         {% if column.visible(grid.isReadyForExport) %}
             <th class="{% if column.align != 'left'%}align-{{ column.align }}{% endif %}{% if column.class %} {{ column.class }}{% endif %}{% if loop.last %} last-column{% endif %}"{% if(column.size > -1) %} style="width:{{ column.size }}px;"{% endif %}>
-            {%- spaceless %}
+            {% apply spaceless %}
             {% if column.type == 'massaction' %}
                 <input type="checkbox" class="grid-mass-selector" onclick="{{ grid.hash }}_markVisible(this.checked);"/>
             {% else %}
@@ -88,7 +88,7 @@
                     {{ columnTitle }}
                 {% endif %}
             {% endif %}
-            {% endspaceless -%}
+            {% endapply -%}
             </th>
         {% endif %}
     {% endfor %}
@@ -128,7 +128,7 @@
 {% block grid_rows %}
     {% for row in grid.rows %}
     {% set last_row = loop.last %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% set gridColumns %}
             {% for column in grid.columns %}
                 {% if column.visible(grid.isReadyForExport) %}
@@ -138,7 +138,7 @@
         {% endset %}
         <tr{% if row.color != '' %} style="background-color:{{ row.color }};"{% endif %} class="grid-row-cells {{ cycle(['odd', 'even'], loop.index) }}{% if row.class != '' %} {{ row.class }}{% endif %}">
         {{ gridColumns }}
-    {% endspaceless %}
+    {% endapply %}
     </tr>
     {% else %}
         {{ grid_no_result(grid) }}
@@ -158,16 +158,16 @@
 {% endblock grid_pager %}
 {# ---------------------------------------------------- grid_pager_totalcount -------------------------------------------------- #}
 {% block grid_pager_totalcount %}
-{{ '%count% Results, ' | transchoice(grid.totalCount, {'%count%': grid.totalCount}) }}
+{{ '%count% Results, ' | trans({'%count%': grid.totalCount}) }}
 {% endblock grid_pager_totalcount %}
 {# ---------------------------------------------------- grid_pager_selectpage -------------------------------------------------- #}
 {% block grid_pager_selectpage %}
 {{ 'Page'|trans }}
-{% spaceless %}
+{% apply spaceless %}
 <input type="button" class="prev" {% if grid.page <= 0 %}disabled="disabled"{% endif %} value="<" onclick="return {{ grid.hash }}_previousPage();"/>
 <input type="text" class="current" value="{{ grid.page + 1 }}" size="2" onkeypress="return {{ grid.hash }}_enterPage(event, parseInt(this.value)-1);"/>
 <input type="button" value=">" class="next" {% if grid.page >= grid.pageCount-1 %}disabled="disabled"{% endif %} onclick="return {{ grid.hash }}_nextPage();"/> {{ 'of %count%'|trans({ '%count%' : grid.pageCount }) }}
-{% endspaceless %}
+{% endapply %}
 {% endblock grid_pager_selectpage %}
 {# ---------------------------------------------------- grid_pager_results_perpage -------------------------------------------------- #}
 {% block grid_pager_results_perpage %}
@@ -188,7 +188,7 @@
         <a href="#" onclick="return {{ grid.hash }}_markAll(false);">{{ 'Deselect all'|trans }}</a>
         <span class="mass-actions-selected" id="{{ grid.hash }}_mass_action_selected"></span>
     </span>
-    {% spaceless %}
+    {% apply spaceless %}
     <div style="float:right;" class="grid_massactions">
         {{ 'Action'|trans }}
         <input type="hidden" id="{{ grid.hash }}_mass_action_all" name="{{ grid.hash }}[{{ constant('APY\\DataGridBundle\\Grid\\Grid::REQUEST_QUERY_MASS_ACTION_ALL_KEYS_SELECTED') }}]" value="0"/>
@@ -200,13 +200,13 @@
         </select>
         <input type="submit"  value="{{ 'Submit Action'|trans }}"/>
     </div>
-    {% endspaceless %}
+    {% endapply %}
 </div>
 {% endblock grid_actions %}
 {# --------------------------------------------------- grid_exports ------------------------------------------------- #}
 {% block grid_exports %}
 <div class="exports" style="float:right">
-    {% spaceless %}
+    {% apply spaceless %}
         {{ 'Export'|trans }}
             <select name="{{grid.hash}}[{{ constant('APY\\DataGridBundle\\Grid\\Grid::REQUEST_QUERY_EXPORT') }}]">
             <option value="-1"></option>
@@ -215,13 +215,13 @@
             {% endfor %}
         </select>
         <input type="submit" value="{{ 'Export'|trans }}"/>
-    {% endspaceless %}
+    {% endapply %}
 </div>
 {% endblock grid_exports %}
 {# --------------------------------------------------- grid_tweaks ------------------------------------------------- #}
 {% block grid_tweaks %}
 <div class="tweaks" style="float:right">
-    {% spaceless %}
+    {% apply spaceless %}
         {{ 'Tweaks'|trans }}
             <select name="{{grid.hash}}[{{ constant('APY\\DataGridBundle\\Grid\\Grid::REQUEST_QUERY_TWEAK') }}]">
             <option value=""></option>
@@ -230,7 +230,7 @@
             {% endfor %}
         </select>
         <input type="submit" value="{{ 'Tweak'|trans }}"/>
-    {% endspaceless %}
+    {% endapply %}
 </div>
 {% endblock grid_tweaks %}
 {# ------------------------------------------------ grid_column_actions_cell --------------------------------------------- #}
@@ -299,7 +299,7 @@
 {% endblock grid_column_type_simple_array_cell %}
 {# ------------------------------------------- grid_column_cell ---------------------------------------- #}
 {% block grid_column_cell %}
-{%- spaceless %}
+{% apply spaceless %}
 {% if column.filterable and column.searchOnClick %}
     {% set sourceValue = sourceValue is defined ? sourceValue : row.field(column.id) %}
     <a href="?{{ grid.hash }}[{{ column.id }}][from]={{ sourceValue | url_encode() }}" class="searchOnClick">{{ value }}</a>
@@ -308,7 +308,7 @@
 {% else %}
     {{ value|escape(column.safe)|raw }}
 {% endif %}
-{% endspaceless -%}
+{% endapply -%}
 {% endblock grid_column_cell %}
 {# -------------------------------------------- grid_column_operator --------------------------------------- #}
 {% block grid_column_operator %}
@@ -328,9 +328,15 @@
 {% set btweOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_BTWE') %}
 {% set isNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNULL') %}
 {% set isNotNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNOTNULL') %}
-{% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
-{% set from = column.data.from is defined ? column.data.from : null %}
-{% set to = column.data.to is defined ? column.data.to : null %}
+{% if column %}
+  {% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
+  {% set from = column.data.from is defined ? column.data.from : null %}
+  {% set to = column.data.to is defined ? column.data.to : null %}
+{% else %}
+  {% set op = column.defaultOperator %}
+  {% set from = null %}
+  {% set to = null %}
+{% endif %}
 <span class="grid-filter-input">
     {{ grid_column_operator(column, grid, op, submitOnChange) }}
     <span class="grid-filter-input-query">
@@ -345,9 +351,15 @@
 {% set btweOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_BTWE') %}
 {% set isNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNULL') %}
 {% set isNotNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNOTNULL') %}
-{% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
-{% set from = column.data.from is defined ? column.data.from : null %}
-{% set to = column.data.to is defined ? column.data.to : null %}
+{% if column %}
+  {% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
+  {% set from = column.data.from is defined ? column.data.from : null %}
+  {% set to = column.data.to is defined ? column.data.to : null %}
+{% else %}
+  {% set op = column.defaultOperator %}
+  {% set from = null %}
+  {% set to = null %}
+{% endif %}
 {% set multiple = column.selectMulti %}
 {% set expanded = column.selectExpanded %}
 <span class="grid-filter-select">

Tests/Grid/Column/TextColumnTest.php

@@ -5,9 +5,9 @@
 use APY\DataGridBundle\Grid\Column\Column;
 use APY\DataGridBundle\Grid\Column\TextColumn;
 use APY\DataGridBundle\Grid\Filter;
-use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class TextColumnTest extends TestCase
+class TextColumnTest extends WebTestCase
 {
     /** @var TextColumn */
     private $column;