瀏覽代碼

Follows the BC Breaks induced by the new Form Component of 2.1 on the filters

Baptiste "Talus" Clavie 13 年之前
父節點
當前提交
45c6d2aa6f

+ 5 - 3
Form/Type/Filter/ChoiceType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class ChoiceType extends AbstractType
 {
     const TYPE_CONTAINS = 1;
@@ -63,11 +65,11 @@ class ChoiceType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'       => 'choice',
             'field_options'    => array()
-        );
+        ));
     }
 }

+ 5 - 3
Form/Type/Filter/DateRangeType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class DateRangeType extends AbstractType
 {
     const TYPE_BETWEEN = 1;
@@ -59,11 +61,11 @@ class DateRangeType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'       => 'sonata_type_date_range',
             'field_options'    => array('format' => 'yyyy-MM-dd')
-        );
+        ));
     }
 }

+ 6 - 4
Form/Type/Filter/DateTimeRangeType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class DateTimeRangeType extends AbstractType
 {
     const TYPE_BETWEEN = 1;
@@ -59,11 +61,11 @@ class DateTimeRangeType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'       => 'sonata_type_datetime_range',
-            'field_options'    => array('date_format' => 'yyyy-MM-dd'),
-        );
+            'field_options'    => array('date_format' => 'yyyy-MM-dd')
+        ));
     }
 }

+ 5 - 3
Form/Type/Filter/DateTimeType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class DateTimeType extends AbstractType
 {
     const TYPE_GREATER_EQUAL = 1;
@@ -75,11 +77,11 @@ class DateTimeType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'       => 'datetime',
             'field_options'    => array('date_format' => 'yyyy-MM-dd')
-        );
+        ));
     }
 }

+ 5 - 3
Form/Type/Filter/DateType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\Optionsresolver\OptionsResolverInterface;
+
 class DateType extends AbstractType
 {
     const TYPE_GREATER_EQUAL = 1;
@@ -75,11 +77,11 @@ class DateType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'       => 'date',
             'field_options'    => array('date_format' => 'yyyy-MM-dd')
-        );
+        ));
     }
 }

+ 5 - 3
Form/Type/Filter/DefaultType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class DefaultType extends AbstractType
 {
     /**
@@ -41,13 +43,13 @@ class DefaultType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'operator_type'    => 'hidden',
             'operator_options' => array(),
             'field_type'       => 'text',
             'field_options'    => array()
-        );
+        ));
     }
 }

+ 6 - 5
Form/Type/Filter/NumberType.php

@@ -17,6 +17,8 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 class NumberType extends AbstractType
 {
     const TYPE_GREATER_EQUAL = 1;
@@ -70,14 +72,13 @@ class NumberType extends AbstractType
     }
 
     /**
-     * @param array $options
-     * @return array
+     * {@inheritDoc}
      */
-    public function getDefaultOptions()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return array(
+        $resolver->setDefaults(array(
             'field_type'    => 'number',
             'field_options' => array(),
-        );
+        ));
     }
 }