Symfony3 compatibility

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - hhvm

Grid/Factory.php

@@ -24,15 +24,17 @@ public function __construct($container)
 
     /**
      * @param string $gridClassName The name of the Grid descendant class that will be instantiated
+     * @param \Symfony\Component\HttpFoundation\Request $request
      *
      * @return \PedroTeixeira\Bundle\GridBundle\Grid\GridAbstract
+     *
      */
-    public function createGrid($gridClassName)
+    public function createGrid($gridClassName, \Symfony\Component\HttpFoundation\Request $request)
     {
         $gridClass = new \ReflectionClass($gridClassName);
 
         /* @var \PedroTeixeira\Bundle\GridBundle\Grid\GridAbstract $grid */
-        $grid = $gridClass->newInstance($this->container);
+        $grid = $gridClass->newInstance($this->container, $request);
         $grid->setupGrid();
 
         return $grid;

Grid/Filter/Operator/Date.php

@@ -2,7 +2,7 @@
 
 namespace PedroTeixeira\Bundle\GridBundle\Grid\Filter\Operator;
 
-use Symfony\Component\Locale\Stub\DateFormat\FullTransformer;
+use Symfony\Component\Intl\DateFormatter\DateFormat\FullTransformer;
 
 /**
  * Date
@@ -18,6 +18,7 @@ public function execute($value)
             $this->container->getParameter('pedro_teixeira_grid.date.date_format'),
             $this->container->getParameter('locale')
         );
+
         $date = new \DateTime();
         $transformer->parse($date, $value);
 

Grid/Filter/Operator/DateRange.php

@@ -2,7 +2,7 @@
 
 namespace PedroTeixeira\Bundle\GridBundle\Grid\Filter\Operator;
 
-use Symfony\Component\Locale\Stub\DateFormat\FullTransformer;
+use Symfony\Component\Intl\DateFormatter\DateFormat\FullTransformer;
 
 /**
  * DateRange

Grid/GridAbstract.php

@@ -8,14 +8,16 @@
 use Doctrine\ORM\Tools\Pagination\Paginator;
 
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Grid Abstract
  */
 abstract class GridAbstract
 {
     /**
-     * @var \Symfony\Component\DependencyInjection\Container
+     * @var Container
      */
     protected $container;
 
@@ -25,7 +27,7 @@ abstract class GridAbstract
     protected $router;
 
     /**
-     * @var \Symfony\Component\HttpFoundation\Request
+     * @var Request
      */
     protected $request;
 
@@ -80,16 +82,17 @@ abstract class GridAbstract
     abstract public function setupGrid();
 
     /**
-     * @param \Symfony\Component\DependencyInjection\Container $container
+     * @param Container $container
+     * @param Request $request
      *
      * @return \PedroTeixeira\Bundle\GridBundle\Grid\GridAbstract
      */
-    public function __construct(\Symfony\Component\DependencyInjection\Container $container)
+    public function __construct(Container $container, Request $request)
     {
         $this->container = $container;
+        $this->request = $request;
 
         $this->router = $this->container->get('router');
-        $this->request = $this->container->get('request');
         $this->templating = $this->container->get('templating');
 
         $this->columns = array();
@@ -109,7 +112,7 @@ public function __construct(\Symfony\Component\DependencyInjection\Container $co
     }
 
     /**
-     * @return \Symfony\Component\DependencyInjection\Container
+     * @return Container
      */
     public function getContainer()
     {
@@ -369,24 +372,24 @@ public function getData()
 
                     $rowColumn = $row[$column->getField()];
 
-                // Array scalar
+                    // Array scalar
                 } elseif (array_key_exists(0, $row) && array_key_exists($column->getField(), $row[0])) {
 
                     $rowColumn = $row[0][$column->getField()];
 
-                // Object
+                    // Object
                 } elseif (method_exists($row, 'get' . ucfirst($column->getField()))) {
 
                     $method = 'get' . ucfirst($column->getField());
                     $rowColumn = $row->$method();
 
-                // Object scalar
+                    // Object scalar
                 } elseif (array_key_exists(0, $row) && method_exists($row[0], 'get' . ucfirst($column->getField()))) {
 
                     $method = 'get' . ucfirst($column->getField());
                     $rowColumn = $row[0]->$method();
 
-                // Array
+                    // Array
                 } elseif ($column->getTwig()) {
 
                     $rowColumn = $this->templating->render(

Grid/Render/Date.php

@@ -2,7 +2,7 @@
 
 namespace PedroTeixeira\Bundle\GridBundle\Grid\Render;
 
-use Symfony\Component\Locale\Stub\DateFormat\FullTransformer;
+use Symfony\Component\Intl\DateFormatter\DateFormat\FullTransformer;
 
 /**
  * Render Date

Grid/Render/DateTime.php

@@ -2,7 +2,7 @@
 
 namespace PedroTeixeira\Bundle\GridBundle\Grid\Render;
 
-use Symfony\Component\Locale\Stub\DateFormat\FullTransformer;
+use Symfony\Component\Intl\DateFormatter\DateFormat\FullTransformer;
 
 /**
  * Render Date

README.md

@@ -1,8 +1,8 @@
-# pedro-teixeira/grid-bundle
+# pedro-teixeira/grid-bundle (Symfony3 fork)
 
 [![Build Status](http://img.shields.io/travis/pedro-teixeira/grid-bundle.svg?style=flat)](https://travis-ci.org/pedro-teixeira/grid-bundle) [![Version](http://img.shields.io/packagist/v/pedro-teixeira/grid-bundle.svg?style=flat)](https://packagist.org/packages/pedro-teixeira/grid-bundle) [![Downloads](http://img.shields.io/packagist/dt/pedro-teixeira/grid-bundle.svg?style=flat)](https://packagist.org/packages/pedro-teixeira/grid-bundle) [![License](http://img.shields.io/packagist/l/pedro-teixeira/grid-bundle.svg?style=flat)](https://packagist.org/packages/pedro-teixeira/grid-bundle)
 
-> Ajax grid for Symfony2
+> Ajax grid for Symfony3
 
 ## Example
 
@@ -158,6 +158,7 @@
     namespace PedroTeixeira\Bundle\TestBundle\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Symfony\Component\HttpFoundation\Request;
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
@@ -175,14 +176,14 @@
           *
           * @return array
           */
-        public function indexAction()
+        public function indexAction(Request $request)
         {
             /** @var \Doctrine\ORM\EntityRepository $repository */
             $repository = $this->getDoctrine()->getRepository('PedroTeixeiraTestBundle:TestEntity');
             $queryBuilder = $repository->createQueryBuilder('r');
 
             /** @var \PedroTeixeira\Bundle\TestBundle\Grid\TestGrid $grid */
-            $grid = $this->get('pedroteixeira.grid')->createGrid('\PedroTeixeira\Bundle\TestBundle\Grid\TestGrid');
+            $grid = $this->get('pedroteixeira.grid')->createGrid('\PedroTeixeira\Bundle\TestBundle\Grid\TestGrid', $request);
             $grid->setQueryBuilder($queryBuilder);
 
             if ($grid->isResponseAnswer()) {

Resources/public/js/grid.js

@@ -1,3 +1,5 @@
+var run = false;
+
 !function ($) {
 
     /* GRID PUBLIC CLASS DEFINITION
@@ -25,6 +27,12 @@
 
         , ajax:function () {
 
+            console.log("run: " + run);
+            if(run) {
+                return;
+            }
+            run = true;
+
             var filters = this.$element.find('form').serializeArray(),
                 tbody = this.$element.find('table').find('tbody.row-result'),
                 emptyTbody = this.$element.find('table').find('tbody.row-empty'),
@@ -84,6 +92,7 @@
                     }
 
                     tbody.html(html)
+                    run = false;
                 },
                 error:function (error) {
                     thisClass.gridUnlock()
@@ -92,6 +101,7 @@
                     tbody.html('')
 
                     alert('Error: ' + error.statusText)
+                    run = false;
                 }
             })
 

composer.json

@@ -1,7 +1,7 @@
 {
-  "name" : "pedro-teixeira/grid-bundle",
+  "name" : "pedro-teixeira/grid-bundle-s3",
   "type" : "symfony-bundle",
-  "description" : "Ajax grid for Symfony2",
+  "description" : "Ajax grid for Symfony3",
   "keywords" : [
     "datagrid",
     "grid"
@@ -17,8 +17,9 @@
   ],
   "require" : {
     "php" : ">=5.3",
-    "symfony/framework-bundle" : "~2 | ~3.0",
-    "doctrine/orm" : "~2.2"
+    "symfony/framework-bundle" : "~3",
+    "symfony/intl": "~3",
+    "doctrine/orm" : "~2.5"
   },
   "require-dev" : {
     "squizlabs/php_codesniffer" : "~1"