Merge pull request #172 from cwhartl/feature/sf3-compatibility

fixed sf3-incompatibility
AliHichem · Apr 25, 2017 · 5386669 · 5386669
2 parents 9c2393c + f74be5b
commit 5386669
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 18 deletions.
diff --git a/Tests/TestBundle/Resources/config/routing.yml b/Tests/TestBundle/Resources/config/routing.yml
@@ -1,15 +1,15 @@
 alidatatable_test_homepage:
-    pattern:  /
+    path:  /
     defaults: { _controller: TestBundle:Default:index }
 
 alidatatable_test_grid:
-    pattern:  /grid
+    path:  /grid
     defaults: { _controller: TestBundle:Default:grid }
 
 alidatatable_test_delete:
-    pattern:  /
+    path:  /
     defaults: { _controller: TestBundle:Default:delete }
 
 alidatatable_test_edit:
-    pattern:  /
+    path:  /
     defaults: { _controller: TestBundle:Default:edit }
diff --git a/Twig/Extension/AliDatatableExtension.php b/Twig/Extension/AliDatatableExtension.php
@@ -3,6 +3,8 @@
 namespace Ali\DatatableBundle\Twig\Extension;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Ali\DatatableBundle\Util\Datatable;
 
 class AliDatatableExtension extends \Twig_Extension
@@ -109,9 +111,16 @@ public function datatable($options)
      */
     private function createDeleteForm($id)
     {
-        return $this->createFormBuilder(array('id' => $id))
-                        ->add('id', 'hidden')
-                        ->getForm();
+        if (version_compare(phpversion(), '5.5', '<')) {
+            return $this->createFormBuilder(array('id' => $id))
+                ->add('id', 'hidden')
+                ->getForm();
+        }
+        else {
+            return $this->createFormBuilder(array('id' => $id))
+                ->add('id', 'Symfony\Component\Form\Extension\Core\Type\HiddenType')
+                ->getForm();
+        }
     }
 
     /**
@@ -123,7 +132,12 @@ private function createDeleteForm($id)
      */
     public function createFormBuilder($data = null, array $options = array())
     {
-        return $this->_container->get('form.factory')->createBuilder('form', $data, $options);
+        if (version_compare(phpversion(), '5.5', '<')) {
+            return $this->_container->get('form.factory')->createBuilder('form', $data, $options);
+        }
+        else {
+            return $this->_container->get('form.factory')->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', $data, $options);
+        }
     }
 
     /**

diff --git a/Util/Datatable.php b/Util/Datatable.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\EntityManager;
@@ -69,7 +70,7 @@ public function __construct(ContainerInterface $container)
     {
         $this->_container        = $container;
         $this->_config           = $this->_container->getParameter('ali_datatable');
-        $this->_request          = $this->_container->get('request');
+        $this->_request          = Request::createFromGlobals();
         self::$_current_instance = $this;
         $this->_applyDefaults();
     }

diff --git a/Util/Factory/Prototype/PrototypeBuilder.php b/Util/Factory/Prototype/PrototypeBuilder.php
@@ -3,6 +3,8 @@
 namespace Ali\DatatableBundle\Util\Factory\Prototype;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 class PrototypeBuilder
 {
@@ -51,14 +53,27 @@ public function __toString()
      */
     protected function _delete_form()
     {
-        return $this->container
-                        ->get('templating.helper.form')
-                        ->widget(
-                                $this->container->get('form.factory')->createBuilder('form', array('id' => '@id'), array())
-                                ->add('id', 'hidden')
-                                ->getForm()
-                                ->createView()
-        );
+
+        if (version_compare(phpversion(), '5.5', '<')) {
+            return $this->container
+                ->get('templating.helper.form')
+                ->widget(
+                    $this->container->get('form.factory')->createBuilder('form', array('id' => '@id'), array())
+                        ->add('id', 'hidden')
+                        ->getForm()
+                        ->createView()
+                );
+        }
+        else {
+            return $this->container
+                ->get('templating.helper.form')
+                ->widget(
+                    $this->container->get('form.factory')->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array('id' => '@id'), array())
+                        ->add('id', 'Symfony\Component\Form\Extension\Core\Type\HiddenType')
+                        ->getForm()
+                        ->createView()
+                );
+        }
     }
 
 }
diff --git a/Util/Factory/Query/DoctrineBuilder.php b/Util/Factory/Query/DoctrineBuilder.php
@@ -5,6 +5,7 @@
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 class DoctrineBuilder implements QueryInterface
 {
@@ -63,7 +64,7 @@ public function __construct(ContainerInterface $container, $em)
     {
         $this->container    = $container;
         $this->em           = $em;
-        $this->request      = $this->container->get('request');
+        $this->request      = Request::createFromGlobals();
         $this->queryBuilder = $this->em->createQueryBuilder();
     }