Improved support for symfony3 (#614)

sonata-project · Aug 16, 2016 · b6d9a60 · b6d9a60
1 parent 9d3d464
commit b6d9a60
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 8 deletions.
diff --git a/Filter/AbstractDateFilter.php b/Filter/AbstractDateFilter.php
@@ -165,6 +165,17 @@ public function getRenderSettings()
             $name .= '_range';
         }
 
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        if (method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')) {
+            $classnames = array(
+                'sonata_type_filter_date' => 'Sonata\AdminBundle\Form\Type\Filter\DateType',
+                'sonata_type_filter_date_range' => 'Sonata\AdminBundle\Form\Type\Filter\DateRangeType',
+                'sonata_type_filter_datetime' => 'Sonata\AdminBundle\Form\Type\Filter\DateTimeType',
+                'sonata_type_filter_datetime_range' => 'Sonata\AdminBundle\Form\Type\Filter\DateTimeRangeType',
+            );
+            $name = $classnames[$name];
+        }
+
         return array($name, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),

diff --git a/Filter/BooleanFilter.php b/Filter/BooleanFilter.php
@@ -66,7 +66,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'operator_type' => 'hidden',

diff --git a/Filter/CallbackFilter.php b/Filter/CallbackFilter.php
@@ -45,7 +45,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'operator_type' => $this->getOption('operator_type'),

diff --git a/Filter/ChoiceFilter.php b/Filter/ChoiceFilter.php
@@ -76,7 +76,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'operator_type' => 'sonata_type_equal',
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),

diff --git a/Filter/ClassFilter.php b/Filter/ClassFilter.php
@@ -76,7 +76,12 @@ public function getFieldOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'operator_type' => 'sonata_type_equal',
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),

diff --git a/Filter/ModelAutocompleteFilter.php b/Filter/ModelAutocompleteFilter.php
@@ -57,7 +57,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'operator_type' => $this->getOption('operator_type'),

diff --git a/Filter/ModelFilter.php b/Filter/ModelFilter.php
@@ -59,7 +59,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\DefaultType'
+            : 'sonata_type_filter_default';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'operator_type' => $this->getOption('operator_type'),

diff --git a/Filter/NumberFilter.php b/Filter/NumberFilter.php
@@ -52,7 +52,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_number', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\NumberType'
+            : 'sonata_type_filter_number';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'label' => $this->getLabel(),

diff --git a/Filter/StringFilter.php b/Filter/StringFilter.php
@@ -65,7 +65,12 @@ public function getDefaultOptions()
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_choice', array(
+        // NEXT_MAJOR: Remove this line when drop Symfony <2.8 support
+        $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Sonata\AdminBundle\Form\Type\Filter\ChoiceType'
+            : 'sonata_type_filter_choice';
+
+        return array($type, array(
             'field_type' => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),
             'label' => $this->getLabel(),