Merge b56d1e3 into 5809062

sonata-project · May 28, 2016 · 987ccbc · 987ccbc
2 parents 5809062 + b56d1e3
commit 987ccbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Builder/DatagridBuilder.php b/Builder/DatagridBuilder.php
@@ -158,7 +158,9 @@ public function getBaseDatagrid(AdminInterface $admin, array $values = array())
             $defaultOptions['csrf_protection'] = false;
         }
 
-        $formBuilder = $this->formFactory->createNamedBuilder('filter', 'form', array(), $defaultOptions);
+        $formtype = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ?
+                                    'Symfony\Component\Form\Extension\Core\Type\FormType' : 'form';
+        $formBuilder = $this->formFactory->createNamedBuilder('filter', $formtype, array(), $defaultOptions);
 
         return new Datagrid($admin->createQuery(), $admin->getList(), $pager, $formBuilder, $values);
     }

diff --git a/Builder/FormContractor.php b/Builder/FormContractor.php
@@ -76,7 +76,10 @@ public function getFormFactory()
      */
     public function getFormBuilder($name, array $options = array())
     {
-        return $this->getFormFactory()->createNamedBuilder($name, 'form', null, $options);
+        $formtype = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ?
+                                    'Symfony\Component\Form\Extension\Core\Type\FormType' : 'form';
+
+        return $this->getFormFactory()->createNamedBuilder($name, $formtype, null, $options);
     }
 
     /**