Fixed Form 2.7 compatibility in type and crud generation

sensiolabs · Oct 9, 2016 · c701fde · c701fde
1 parent ae67a68
commit c701fde
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 35 deletions.
diff --git a/Generator/DoctrineCrudGenerator.php b/Generator/DoctrineCrudGenerator.php
@@ -183,6 +183,8 @@ protected function generateControllerClass($forceOverwrite)
             'namespace' => $this->bundle->getNamespace(),
             'entity_namespace' => $entityNamespace,
             'format' => $this->format,
+            // BC with Symfony 2.7
+            'use_form_type_instance' => !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix'),
         ));
     }
 

diff --git a/Generator/DoctrineFormGenerator.php b/Generator/DoctrineFormGenerator.php
@@ -77,13 +77,14 @@ public function generate(BundleInterface $bundle, $entity, ClassMetadataInfo $me
 
         $this->renderFile('form/FormType.php.twig', $this->classPath, array(
             'fields' => $this->getFieldsFromMetadata($metadata),
-            'fields_mapping' => $metadata->fieldMappings,
             'namespace' => $bundle->getNamespace(),
             'entity_namespace' => implode('\\', $parts),
             'entity_class' => $entityClass,
             'bundle' => $bundle->getName(),
             'form_class' => $this->className,
             'form_type_name' => strtolower(str_replace('\\', '_', $bundle->getNamespace()).($parts ? '_' : '').implode('_', $parts).'_'.substr($this->className, 0, -4)),
+            // BC with Symfony 2.7
+            'get_name_required' => !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix'),
         ));
     }
 

diff --git a/Resources/skeleton/crud/actions/delete.php.twig b/Resources/skeleton/crud/actions/delete.php.twig
@@ -22,7 +22,7 @@
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->remove(${{ entity_singularized }});
-            $em->flush();
+            $em->flush(${{ entity_singularized }});
         }
 {% endblock method_body %}
 

diff --git a/Resources/skeleton/crud/actions/edit.php.twig b/Resources/skeleton/crud/actions/edit.php.twig
@@ -17,13 +17,15 @@
     {
 {% block method_body %}
         $deleteForm = $this->createDeleteForm(${{ entity_singularized }});
-        $editForm = $this->createForm('{{ namespace }}\Form\{{ entity }}Type', ${{ entity_singularized }});
+        {% if use_form_type_instance -%}
+            $editForm = $this->createForm(new {{ entity_singularized|capitalize }}Type(), ${{ entity_singularized }});
+        {% else -%}
+            $editForm = $this->createForm('{{ namespace }}\Form\{{ entity }}Type', ${{ entity_singularized }});
+        {% endif -%}
         $editForm->handleRequest($request);
 
         if ($editForm->isSubmitted() && $editForm->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist(${{ entity_singularized }});
-            $em->flush();
+            $this->getDoctrine()->getManager()->flush();
 
             return $this->redirectToRoute('{{ route_name_prefix }}_edit', array('id' => ${{ entity_singularized }}->getId()));
         }

diff --git a/Resources/skeleton/crud/actions/new.php.twig b/Resources/skeleton/crud/actions/new.php.twig
@@ -1,7 +1,7 @@
 
     /**
 {% block phpdoc_method_header %}
-     * Creates a new {{ entity }} entity.
+     * Creates a new {{ entity_singularized }} entity.
 {% endblock phpdoc_method_header %}
      *
 {% block phpdoc_method_annotations %}
@@ -16,7 +16,11 @@
 {% endblock method_definition %}
     {
 {% block method_body %}
-        $form = $this->createForm('{{ namespace }}\Form\{{ entity }}Type');
+        {% if use_form_type_instance -%}
+            $form = $this->createForm(new {{ entity_singularized|capitalize }}Type());
+        {% else -%}
+            $form = $this->createForm('{{ namespace }}\Form\{{ entity }}Type');
+        {% endif -%}
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {

diff --git a/Resources/skeleton/crud/controller.php.twig b/Resources/skeleton/crud/controller.php.twig
@@ -3,20 +3,19 @@
 namespace {{ namespace }}\Controller{{ entity_namespace ? '\\' ~ entity_namespace : '' }};
 
 {% block use_statements %}
-{% if 'new' in actions or 'edit' in actions or 'delete' in actions %}
-use Symfony\Component\HttpFoundation\Request;
-{%- endif %}
-
+use {{ namespace }}\Entity\{{ entity }};
+{% if ('new' in actions or 'edit' in actions) and use_form_type_instance %}
+use {{ namespace }}\Form\{{ entity }}Type;
+{% endif %}
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 {% if 'annotation' == format -%}
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 {%- endif %}
+{% if 'new' in actions or 'edit' in actions or 'delete' in actions %}
+use Symfony\Component\HttpFoundation\Request;
+{%- endif %}
 
-use {{ namespace }}\Entity\{{ entity }};
-{% if 'new' in actions or 'edit' in actions %}
-use {{ namespace }}\Form\{{ entity }}Type;
-{% endif %}
 {% endblock use_statements %}
 
 /**

diff --git a/Resources/skeleton/form/FormType.php.twig b/Resources/skeleton/form/FormType.php.twig
@@ -20,19 +20,11 @@ class {{ form_class }} extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
+            {%- for field in fields -%}
 
-        {%- for field in fields -%}
-            {%- if fields_mapping[field] is defined and fields_mapping[field]['type'] in ['date', 'time', 'datetime'] %}
-
-            ->add('{{ field }}', '{{ fields_mapping[field]['type'] }}')
-
-            {%- else %}
-
-            ->add('{{ field }}')
-
-            {%- endif -%}
-        {%- endfor %}
+                ->add('{{ field }}')
 
+            {%- endfor %}
         ;
     }
     {% endif %}
@@ -47,5 +39,24 @@ class {{ form_class }} extends AbstractType
         ));
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return '{{ form_type_name }}';
+    }
+
+{# BC with Symfony 2.7 #}
+{%- if get_name_required %}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+{% endif %}
+
 {% endblock class_body %}
 }
diff --git a/Tests/Generator/DoctrineCrudGeneratorTest.php b/Tests/Generator/DoctrineCrudGeneratorTest.php
@@ -202,9 +202,15 @@ public function testGenerateNamespacedEntity()
             'public function showAction(Post $post)',
             '\'post\' => $post,',
             '\'posts\' => $posts,',
-            '$form = $this->createForm(\'Foo\BarBundle\Form\Blog\PostType\');',
-            '$editForm = $this->createForm(\'Foo\BarBundle\Form\Blog\PostType\', $post);',
         );
+        if (method_exists('Symfony\Compoennt\Form\AbstractType', 'getBlockPrefix')) {
+            // Symfony >= 2.8
+            $strings[] ='$form = $this->createForm(\'Foo\BarBundle\Form\Blog\PostType\');';
+            $strings[] = '$editForm = $this->createForm(\'Foo\BarBundle\Form\Blog\PostType\', $post);';
+        } else {
+            $strings[] ='$form = $this->createForm(new PostType());';
+            $strings[] = '$editForm = $this->createForm(new PostType(), $post);';
+        }
         foreach ($strings as $string) {
             $this->assertContains($string, $content);
         }

diff --git a/Tests/Generator/DoctrineFormGeneratorTest.php b/Tests/Generator/DoctrineFormGeneratorTest.php
@@ -25,9 +25,9 @@ public function testGenerate()
         $this->assertContains('namespace Foo\BarBundle\Form', $content);
         $this->assertContains('class PostType extends AbstractType', $content);
         $this->assertContains('->add(\'title\')', $content);
-        $this->assertContains('->add(\'createdAt\', \'date\')', $content);
-        $this->assertContains('->add(\'publishedAt\', \'time\')', $content);
-        $this->assertContains('->add(\'updatedAt\', \'datetime\')', $content);
+        $this->assertContains('->add(\'createdAt\')', $content);
+        $this->assertContains('->add(\'publishedAt\')', $content);
+        $this->assertContains('->add(\'updatedAt\')', $content);
         $this->assertContains('public function configureOptions(OptionsResolver $resolver)', $content);
         $this->assertContains('\'data_class\' => \'Foo\BarBundle\Entity\Post\'', $content);
     }
@@ -42,11 +42,20 @@ public function testGenerateSubNamespacedEntity()
         $this->assertContains('namespace Foo\BarBundle\Form\Blog', $content);
         $this->assertContains('class PostType extends AbstractType', $content);
         $this->assertContains('->add(\'title\')', $content);
-        $this->assertContains('->add(\'createdAt\', \'date\')', $content);
-        $this->assertContains('->add(\'publishedAt\', \'time\')', $content);
-        $this->assertContains('->add(\'updatedAt\', \'datetime\')', $content);
+        $this->assertContains('->add(\'createdAt\')', $content);
+        $this->assertContains('->add(\'publishedAt\')', $content);
+        $this->assertContains('->add(\'updatedAt\')', $content);
         $this->assertContains('public function configureOptions(OptionsResolver $resolver)', $content);
         $this->assertContains('\'data_class\' => \'Foo\BarBundle\Entity\Blog\Post\'', $content);
+        $this->assertContains('public function getBlockPrefix()', $content);
+        $this->assertContains('return \'foo_barbundle_blog_post\';', $content);
+        if (method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')) {
+            // Symfony >= 2.8
+            $this->assertNotContains('public function getName()', $content);
+        } else {
+            // BC Symfony 2.7
+            $this->assertContains('public function getName()', $content);
+        }
     }
 
     /**