Rename StringType => ChoiceType

Filter/ORM/StringFilter.php

@@ -11,7 +11,7 @@
 
 namespace Sonata\AdminBundle\Filter\ORM;
 
-use Sonata\AdminBundle\Form\Type\Filter\StringType;
+use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
 
 class StringFilter extends Filter
 {
@@ -43,7 +43,7 @@ class StringFilter extends Filter
         // c.name > '1' => c.name OPERATOR :FIELDNAME
         $queryBuilder->andWhere(sprintf('%s.%s %s :%s', $alias, $field, $operator, $this->getName()));
 
-        if ($value['type'] == StringType::TYPE_EQUAL) {
+        if ($value['type'] == ChoiceType::TYPE_EQUAL) {
             $queryBuilder->setParameter($this->getName(), $value['text']);
         } else {
             $queryBuilder->setParameter($this->getName(), sprintf($this->getOption('format'), $value['text']));
@@ -57,9 +57,9 @@ class StringFilter extends Filter
     private function getOperator($type)
     {
         $choices = array(
-            StringType::TYPE_CONTAINS         => 'LIKE',
-            StringType::TYPE_NOT_CONTAINS     => 'NOT LIKE',
-            StringType::TYPE_EQUAL            => '=',
+            ChoiceType::TYPE_CONTAINS         => 'LIKE',
+            ChoiceType::TYPE_NOT_CONTAINS     => 'NOT LIKE',
+            ChoiceType::TYPE_EQUAL            => '=',
         );
 
         return isset($choices[$type]) ? $choices[$type] : false;
@@ -74,5 +74,4 @@ class StringFilter extends Filter
             'format'   => '%%%s%%'
         );
     }
-
 }

Form/Type/Filter/BooleanType.php

@@ -11,15 +11,10 @@
 
 namespace Sonata\AdminBundle\Form\Type\Filter;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormTypeInterface;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType as FormChoiceType;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-class BooleanType extends ChoiceType
+class BooleanType extends FormChoiceType
 {
     const TYPE_YES = 1;
 

Form/Type/Filter/StringType.php

@@ -18,7 +18,7 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
-class StringType extends AbstractType
+class ChoiceType extends AbstractType
 {
     const TYPE_CONTAINS = 1;
 
@@ -40,7 +40,7 @@ class StringType extends AbstractType
      */
     function getName()
     {
-        return 'sonata_type_filter_strinf';
+        return 'sonata_type_filter_choice';
     }
 
     public function buildForm(FormBuilder $builder, array $options)

Guesser/ORM/FilterTypeGuesser.php

@@ -98,7 +98,7 @@ class FilterTypeGuesser implements TypeGuesserInterface
                 return new TypeGuess('doctrine_orm_number', $options, Guess::MEDIUM_CONFIDENCE);
             case 'string':
             case 'text':
-                $options['field_type'] = 'sonata_type_filter_string';
+                $options['field_type'] = 'sonata_type_filter_choice';
 
                 return new TypeGuess('doctrine_orm_string', $options, Guess::MEDIUM_CONFIDENCE);
             case 'time':

Resources/config/form_types.xml

@@ -39,8 +39,8 @@
             <argument type="service" id="translator" />
         </service>
 
-        <service id="sonata.admin.form.filter.type.string" class="Sonata\AdminBundle\Form\Type\Filter\StringType">
-            <tag name="form.type" alias="sonata_type_filter_string" />
+        <service id="sonata.admin.form.filter.type.choice" class="Sonata\AdminBundle\Form\Type\Filter\ChoiceType">
+            <tag name="form.type" alias="sonata_type_filter_choice" />
 
             <argument type="service" id="translator" />
         </service>

Tests/Filter/ORM/StringFilterTest.php

@@ -12,7 +12,7 @@
 namespace Sonata\AdminBundle\Tests\Filter\ORM;
 
 use Sonata\AdminBundle\Filter\ORM\StringFilter;
-use Sonata\AdminBundle\Form\Type\Filter\StringType;
+use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
 
 class StringFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -37,7 +37,7 @@ class StringFilterTest extends \PHPUnit_Framework_TestCase
         $builder = new QueryBuilder;
         $this->assertEquals(array(), $builder->query);
 
-        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => StringType::TYPE_CONTAINS));
+        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => ChoiceType::TYPE_CONTAINS));
         $this->assertEquals(array('alias.field LIKE :field_name'), $builder->query);
         $this->assertEquals(array('field_name' => 'asd'), $builder->parameters);
 
@@ -58,7 +58,7 @@ class StringFilterTest extends \PHPUnit_Framework_TestCase
         $builder = new QueryBuilder;
         $this->assertEquals(array(), $builder->query);
 
-        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => StringType::TYPE_NOT_CONTAINS));
+        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => ChoiceType::TYPE_NOT_CONTAINS));
         $this->assertEquals(array('alias.field NOT LIKE :field_name'), $builder->query);
         $this->assertEquals(array('field_name' => 'asd'), $builder->parameters);
     }
@@ -71,7 +71,7 @@ class StringFilterTest extends \PHPUnit_Framework_TestCase
         $builder = new QueryBuilder;
         $this->assertEquals(array(), $builder->query);
 
-        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => StringType::TYPE_EQUAL));
+        $filter->filter($builder, 'alias', 'field', array('text' => 'asd', 'type' => ChoiceType::TYPE_EQUAL));
         $this->assertEquals(array('alias.field = :field_name'), $builder->query);
         $this->assertEquals(array('field_name' => 'asd'), $builder->parameters);
     }