Explorar o código

Use form type names instead of FQCN (reverts #3709) (#3753)

My previously merged change turned out to not fix, but break the admin
panel. While there can be no garantee that this commit "fixes" anything
instead of breaking it, the change of getting a working admin panel will
be significantly increased after this PR. This because it reverts things
back to the state they were for the past 5 years (without any bug report
about it being broken).
Wouter J %!s(int64=9) %!d(string=hai) anos
pai
achega
5009ab9b74

+ 4 - 4
Datagrid/Datagrid.php

@@ -126,15 +126,15 @@ class Datagrid implements DatagridInterface
             $this->formBuilder->add($filter->getFormName(), $type, $options);
             $this->formBuilder->add($filter->getFormName(), $type, $options);
         }
         }
 
 
-        $this->formBuilder->add('_sort_by', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
+        $this->formBuilder->add('_sort_by', 'hidden');
         $this->formBuilder->get('_sort_by')->addViewTransformer(new CallbackTransformer(
         $this->formBuilder->get('_sort_by')->addViewTransformer(new CallbackTransformer(
             function ($value) { return $value; },
             function ($value) { return $value; },
             function ($value) { return $value instanceof FieldDescriptionInterface ? $value->getName() : $value; }
             function ($value) { return $value instanceof FieldDescriptionInterface ? $value->getName() : $value; }
         ));
         ));
 
 
-        $this->formBuilder->add('_sort_order', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
-        $this->formBuilder->add('_page', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
-        $this->formBuilder->add('_per_page', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
+        $this->formBuilder->add('_sort_order', 'hidden');
+        $this->formBuilder->add('_page', 'hidden');
+        $this->formBuilder->add('_per_page', 'hidden');
 
 
         $this->form = $this->formBuilder->getForm();
         $this->form = $this->formBuilder->getForm();
         $this->form->submit($this->values);
         $this->form->submit($this->values);

+ 1 - 1
Filter/Filter.php

@@ -95,7 +95,7 @@ abstract class Filter implements FilterInterface
      */
      */
     public function getFieldType()
     public function getFieldType()
     {
     {
-        return $this->getOption('field_type', 'Symfony\Component\Form\Extension\Core\Type\TextType');
+        return $this->getOption('field_type', 'text');
     }
     }
 
 
     /**
     /**

+ 1 - 1
Tests/Datagrid/DatagridMapperTest.php

@@ -104,7 +104,7 @@ class DatagridMapperTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Sonata\AdminBundle\Filter\FilterInterface', $filter);
         $this->assertInstanceOf('Sonata\AdminBundle\Filter\FilterInterface', $filter);
         $this->assertSame('foo.name', $filter->getName());
         $this->assertSame('foo.name', $filter->getName());
         $this->assertSame('foo__name', $filter->getFormName());
         $this->assertSame('foo__name', $filter->getFormName());
-        $this->assertSame('Symfony\Component\Form\Extension\Core\Type\TextType', $filter->getFieldType());
+        $this->assertSame('text', $filter->getFieldType());
         $this->assertSame('fooLabel', $filter->getLabel());
         $this->assertSame('fooLabel', $filter->getLabel());
         $this->assertSame(array('required' => false), $filter->getFieldOptions());
         $this->assertSame(array('required' => false), $filter->getFieldOptions());
         $this->assertSame(array(
         $this->assertSame(array(

+ 1 - 1
Tests/Filter/FilterTest.php

@@ -19,7 +19,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     {
     {
         $filter = new FooFilter();
         $filter = new FooFilter();
 
 
-        $this->assertSame('Symfony\Component\Form\Extension\Core\Type\TextType', $filter->getFieldType());
+        $this->assertSame('text', $filter->getFieldType());
         $this->assertSame(array('required' => false), $filter->getFieldOptions());
         $this->assertSame(array('required' => false), $filter->getFieldOptions());
         $this->assertNull($filter->getLabel());
         $this->assertNull($filter->getLabel());