Used classname in form type name (sonata-project#4118)

BacLuc · Sep 2, 2016 · 1541dd8 · 1541dd8
1 parent 280c412
commit 1541dd8
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 14 deletions.
diff --git a/Form/Type/ChoiceFieldMaskType.php b/Form/Type/ChoiceFieldMaskType.php
@@ -77,7 +77,10 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'choice';
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+            : 'choice';
     }
 
     /**

diff --git a/Form/Type/Filter/DateRangeType.php b/Form/Type/Filter/DateRangeType.php
@@ -92,7 +92,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add('type', 'choice', $choiceOptions)
+            // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+            ->add('type', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+                : 'choice', $choiceOptions)
             ->add('value', $options['field_type'], $options['field_options'])
         ;
     }

diff --git a/Form/Type/Filter/DateTimeRangeType.php b/Form/Type/Filter/DateTimeRangeType.php
@@ -92,7 +92,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add('type', 'choice', $choiceOptions)
+            // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+            ->add('type', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+                : 'choice', $choiceOptions)
             ->add('value', $options['field_type'], $options['field_options'])
         ;
     }

diff --git a/Form/Type/Filter/DateTimeType.php b/Form/Type/Filter/DateTimeType.php
@@ -108,7 +108,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add('type', 'choice', $choiceOptions)
+            // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+            ->add('type', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+                : 'choice', $choiceOptions)
             ->add('value', $options['field_type'], array_merge(array('required' => false), $options['field_options']))
         ;
     }

diff --git a/Form/Type/Filter/DateType.php b/Form/Type/Filter/DateType.php
@@ -108,7 +108,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add('type', 'choice', $choiceOptions)
+            // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+            ->add('type', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+                : 'choice', $choiceOptions)
             ->add('value', $options['field_type'], array_merge(array('required' => false), $options['field_options']))
         ;
     }

diff --git a/Form/Type/Filter/DefaultType.php b/Form/Type/Filter/DefaultType.php
@@ -68,9 +68,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'operator_type' => 'hidden',
+            'operator_type' => method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\HiddenType'
+                : 'hidden', // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
             'operator_options' => array(),
-            'field_type' => 'text',
+            'field_type' => method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\TextType'
+                : 'text', // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
             'field_options' => array(),
         ));
     }

diff --git a/Form/Type/Filter/NumberType.php b/Form/Type/Filter/NumberType.php
@@ -103,7 +103,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         $builder
-            ->add('type', 'choice', $choiceOptions)
+            // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+            ->add('type', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+                ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+                : 'choice', $choiceOptions)
             ->add('value', $options['field_type'], array_merge(array('required' => false), $options['field_options']))
         ;
     }

diff --git a/Form/Type/ModelHiddenType.php b/Form/Type/ModelHiddenType.php
@@ -60,7 +60,10 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'hidden';
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\HiddenType'
+            : 'hidden';
     }
 
     /**

diff --git a/Form/Type/ModelListType.php b/Form/Type/ModelListType.php
@@ -96,7 +96,10 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'text';
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\TextType'
+            : 'text';
     }
 
     /**

diff --git a/Form/Type/ModelReferenceType.php b/Form/Type/ModelReferenceType.php
@@ -59,7 +59,10 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'text';
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\TextType'
+            : 'text';
     }
 
     /**

diff --git a/Form/Type/ModelType.php b/Form/Type/ModelType.php
@@ -171,7 +171,10 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'choice';
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+            : 'choice';
     }
 
     /**

diff --git a/Tests/Form/Type/ChoiceFieldMaskTypeTest.php b/Tests/Form/Type/ChoiceFieldMaskTypeTest.php
@@ -49,6 +49,9 @@ public function testGetName()
     public function testGetParent()
     {
         $type = new ChoiceFieldMaskType();
-        $this->assertSame('choice', $type->getParent());
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        $this->assertSame(method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'
+            : 'choice', $type->getParent());
     }
 }
diff --git a/Tests/Form/Type/ModelHiddenTypeTest.php b/Tests/Form/Type/ModelHiddenTypeTest.php
@@ -45,6 +45,9 @@ public function testGetName()
     public function testGetParent()
     {
         $type = new ModelHiddenType();
-        $this->assertSame('hidden', $type->getParent());
+        // NEXT_MAJOR: Remove ternary (when requirement of Symfony is >= 2.8)
+        $this->assertSame(method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\HiddenType'
+            : 'hidden', $type->getParent());
     }
 }