Merge branch 'master' into npotier-patch-1

Author: npotier

.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,13 +29,9 @@ 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
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
+  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev --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

@@ -528,12 +528,12 @@ public function getData()
         $result = [];
 
         $hasValue = false;
-        if ($this->data['from'] != $this::DEFAULT_VALUE) {
+        if (isset($this->data['from']) && $this->data['from'] != $this::DEFAULT_VALUE) {
             $result['from'] = $this->data['from'];
             $hasValue = true;
         }
 
-        if ($this->data['to'] != $this::DEFAULT_VALUE) {
+        if (isset($this->data['to']) && $this->data['to'] != $this::DEFAULT_VALUE) {
             $result['to'] = $this->data['to'];
             $hasValue = true;
         }
@@ -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/Column/DateColumn.php

@@ -20,6 +20,8 @@ class DateColumn extends DateTimeColumn
 
     protected $fallbackFormat = 'Y-m-d';
 
+    protected $fallbackInputFormat = 'Y-m-d';
+
     public function getFilters($source)
     {
         $parentFilters = parent::getFilters($source);

Grid/Column/DateTimeColumn.php

@@ -24,13 +24,18 @@ class DateTimeColumn extends Column
 
     protected $fallbackFormat = 'Y-m-d H:i:s';
 
+    protected $inputFormat;
+
+    protected $fallbackInputFormat = 'Y-m-d H:i:s';
+
     protected $timezone;
 
     public function __initialize(array $params)
     {
         parent::__initialize($params);
 
         $this->setFormat($this->getParam('format'));
+        $this->setInputFormat($this->getParam('inputFormat', $this->fallbackInputFormat));
         $this->setOperators($this->getParam('operators', [
             self::OPERATOR_EQ,
             self::OPERATOR_NEQ,
@@ -56,7 +61,7 @@ public function isQueryValid($query)
 
     protected function isDateTime($query)
     {
-        return strtotime($query) !== false;
+        return false !== \DateTime::createFromFormat($this->inputFormat, $query);
     }
 
     public function getFilters($source)
@@ -65,7 +70,7 @@ public function getFilters($source)
 
         $filters = [];
         foreach ($parentFilters as $filter) {
-            $filters[] = ($filter->getValue() === null) ? $filter : $filter->setValue(new \DateTime($filter->getValue()));
+            $filters[] = ($filter->getValue() === null) ? $filter : $filter->setValue(\DateTime::createFromFormat($this->inputFormat, $filter->getValue()));
         }
 
         return $filters;
@@ -160,6 +165,18 @@ public function getFormat()
         return $this->format;
     }
 
+    public function setInputFormat($inputFormat)
+    {
+        $this->inputFormat = $inputFormat;
+
+        return $this;
+    }
+
+    public function getInputFormat()
+    {
+        return $this->inputFormat;
+    }
+
     public function getTimezone()
     {
         return $this->timezone;

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

@@ -109,8 +109,8 @@ class MyEntity
 And clear your cache.
 
 ## Bundle history
+
 Datagrid for Symfony inspired by Zfdatagrid and Magento Grid.  
 This bundle was initiated by Stanislav Turza (Sorien).
 
 See [CHANGELOG](https://github.com/APY/APYDataGridBundle/blob/master/CHANGELOG.md) and [UPGRADE 2.0](https://github.com/APY/APYDataGridBundle/blob/master/UPGRADE-2.0.md)
-

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" />