symfony · kbond · Apr 25, 2025 · Apr 25, 2025
diff --git a/config/help/MakeForm.txt b/config/help/MakeForm.txt
@@ -1,16 +1,16 @@
 The <info>%command.name%</info> command generates a new form class.
 
-<info>php %command.full_name% UserType</info>
+<info>php %command.full_name% UserForm</info>
 
 If the argument is missing, the command will ask for the form class interactively.
 
 You can optionally specify the bound class in a second argument.
 This can be the name of an entity like <info>User</info>
 
-<info>php %command.full_name% UserType User</info>
+<info>php %command.full_name% UserForm User</info>
 
 You can also specify a fully qualified name to another class like <info>\App\Dto\UserData</info>.
 Slashes must be escaped in the argument.
 
-<info>php %command.full_name% UserType \\App\\Dto\\UserData</info>
+<info>php %command.full_name% UserForm \\App\\Dto\\UserData</info>
 
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
@@ -140,9 +140,9 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $iter = 0;
         do {
             $formClassDetails = $generator->createClassNameDetails(
-                $entityClassDetails->getRelativeNameWithoutSuffix().($iter ?: '').'Type',
+                $entityClassDetails->getRelativeNameWithoutSuffix().($iter ?: ''),
                 'Form\\',
-                'Type'
+                'Form'
             );
             ++$iter;
         } while (class_exists($formClassDetails->getFullName()));

diff --git a/src/Maker/MakeForm.php b/src/Maker/MakeForm.php
@@ -51,7 +51,7 @@ public static function getCommandDescription(): string
     public function configureCommand(Command $command, InputConfiguration $inputConfig): void
     {
         $command
-            ->addArgument('name', InputArgument::OPTIONAL, \sprintf('The name of the form class (e.g. <fg=yellow>%sType</>)', Str::asClassName(Str::getRandomTerm())))
+            ->addArgument('name', InputArgument::OPTIONAL, \sprintf('The name of the form class (e.g. <fg=yellow>%Form</>)', Str::asClassName(Str::getRandomTerm())))
             ->addArgument('bound-class', InputArgument::OPTIONAL, 'The name of Entity or fully qualified model class name that the new form will be bound to (empty for none)')
             ->setHelp($this->getHelpFileContents('MakeForm.txt'))
         ;
@@ -80,7 +80,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $formClassNameDetails = $generator->createClassNameDetails(
             $input->getArgument('name'),
             'Form\\',
-            'Type'
+            'Form'
         );
 
         $formFields = ['field_name' => null];

diff --git a/src/Maker/MakeRegistrationForm.php b/src/Maker/MakeRegistrationForm.php
@@ -548,7 +548,7 @@ public function configureDependencies(DependencyBuilder $dependencies): void
     private function generateFormClass(ClassNameDetails $userClassDetails, Generator $generator, string $usernameField): ClassNameDetails
     {
         $formClassDetails = $generator->createClassNameDetails(
-            'RegistrationFormType',
+            'RegistrationForm',
             'Form\\'
         );
 

diff --git a/src/Maker/MakeResetPassword.php b/src/Maker/MakeResetPassword.php
@@ -227,12 +227,12 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         );
 
         $requestFormTypeClassNameDetails = $generator->createClassNameDetails(
-            'ResetPasswordRequestFormType',
+            'ResetPasswordRequestForm',
             'Form\\'
         );
 
         $changePasswordFormTypeClassNameDetails = $generator->createClassNameDetails(
-            'ChangePasswordFormType',
+            'ChangePasswordForm',
             'Form\\'
         );
 
@@ -301,7 +301,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $generator->generateClass(
             $requestFormTypeClassNameDetails->getFullName(),
-            'resetPassword/ResetPasswordRequestFormType.tpl.php',
+            'resetPassword/ResetPasswordRequestForm.tpl.php',
             [
                 'use_statements' => $useStatements,
                 'email_field' => $this->emailPropertyName,
@@ -322,7 +322,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $generator->generateClass(
             $changePasswordFormTypeClassNameDetails->getFullName(),
-            'resetPassword/ChangePasswordFormType.tpl.php',
+            'resetPassword/ChangePasswordForm.tpl.php',
             ['use_statements' => $useStatements]
         );
 

diff --git a/src/Renderer/FormTypeRenderer.php b/src/Renderer/FormTypeRenderer.php
@@ -70,7 +70,7 @@ public function render(ClassNameDetails $formClassDetails, array $formFields, ?C
 
         $this->generator->generateClass(
             $formClassDetails->getFullName(),
-            'form/Type.tpl.php',
+            'form/Form.tpl.php',
             [
                 'use_statements' => $useStatements,
                 'bounded_class_name' => $boundClassDetails ? $boundClassDetails->getShortName() : null,

diff --git a/templates/form/Type.tpl.php → templates/form/Form.tpl.php b/templates/form/Type.tpl.php → templates/form/Form.tpl.php
diff --git a/...etPassword/ChangePasswordFormType.tpl.php → .../resetPassword/ChangePasswordForm.tpl.php b/...etPassword/ChangePasswordFormType.tpl.php → .../resetPassword/ChangePasswordForm.tpl.php
diff --git a/...word/ResetPasswordRequestFormType.tpl.php → ...Password/ResetPasswordRequestForm.tpl.php b/...word/ResetPasswordRequestFormType.tpl.php → ...Password/ResetPasswordRequestForm.tpl.php
diff --git a/tests/Maker/MakeCrudTest.php b/tests/Maker/MakeCrudTest.php
@@ -39,7 +39,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
             }),
@@ -59,7 +59,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodAdminController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_crud_with_custom_controller.php');
             }),
@@ -80,7 +80,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
                 $this->assertStringContainsString('tests/Controller/SweetFoodControllerTest.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
@@ -107,7 +107,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
                 $this->assertStringContainsString('tests/Controller/SweetFoodControllerTest.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
@@ -145,7 +145,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_crud_with_custom_root_namespace.php');
             }),
@@ -169,7 +169,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
                 self::assertFileEquals(
@@ -195,7 +195,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
             }),

diff --git a/tests/Maker/MakeFormTest.php b/tests/Maker/MakeFormTest.php
@@ -50,7 +50,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'SourFoodType',
+                    'SourFoodForm',
                     'SourFood',
                 ]);
 
@@ -67,7 +67,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'TaskType',
+                    'TaskForm',
                     '\\App\\Form\\Data\\TaskData',
                 ]);
 
@@ -89,7 +89,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'SourFoodType',
+                    'SourFoodForm',
                     'SourFood',
                 ]);
 
@@ -111,7 +111,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'BookType',
+                    'BookForm',
                     'Book',
                 ]);
 
@@ -132,7 +132,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'AuthorType',
+                    'AuthorForm',
                     'Author',
                 ]);
 
@@ -153,7 +153,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'BookType',
+                    'BookForm',
                     'Book',
                 ]);
 
@@ -174,7 +174,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'LibraryType',
+                    'LibraryForm',
                     'Library',
                 ]);
 
@@ -195,7 +195,7 @@ public function getTestDetails(): \Generator
 
                 $runner->runMaker([
                     // Entity name
-                    'FoodType',
+                    'FoodForm',
                     'Food',
                 ]);
 

diff --git a/tests/Maker/MakeResetPasswordTest.php b/tests/Maker/MakeResetPasswordTest.php
@@ -44,8 +44,8 @@ public function getTestDetails(): \Generator
                 $generatedFiles = [
                     'src/Controller/ResetPasswordController.php',
                     'src/Entity/ResetPasswordRequest.php',
-                    'src/Form/ChangePasswordFormType.php',
-                    'src/Form/ResetPasswordRequestFormType.php',
+                    'src/Form/ChangePasswordForm.php',
+                    'src/Form/ResetPasswordRequestForm.php',
                     'src/Repository/ResetPasswordRequestRepository.php',
                     'templates/reset_password/check_email.html.twig',
                     'templates/reset_password/email.html.twig',
@@ -148,8 +148,8 @@ public function getTestDetails(): \Generator
                 $generatedFiles = [
                     'src/Controller/ResetPasswordController.php',
                     'src/Entity/ResetPasswordRequest.php',
-                    'src/Form/ChangePasswordFormType.php',
-                    'src/Form/ResetPasswordRequestFormType.php',
+                    'src/Form/ChangePasswordForm.php',
+                    'src/Form/ResetPasswordRequestForm.php',
                     'src/Repository/ResetPasswordRequestRepository.php',
                     'templates/reset_password/check_email.html.twig',
                     'templates/reset_password/email.html.twig',
@@ -208,8 +208,8 @@ public function getTestDetails(): \Generator
                 $generatedFiles = [
                     'src/Controller/ResetPasswordController.php',
                     'src/Entity/ResetPasswordRequest.php',
-                    'src/Form/ChangePasswordFormType.php',
-                    'src/Form/ResetPasswordRequestFormType.php',
+                    'src/Form/ChangePasswordForm.php',
+                    'src/Form/ResetPasswordRequestForm.php',
                     'src/Repository/ResetPasswordRequestRepository.php',
                     'templates/reset_password/check_email.html.twig',
                     'templates/reset_password/email.html.twig',
@@ -361,7 +361,7 @@ public function getTestDetails(): \Generator
                 $this->assertStringContainsString('ORM\ManyToOne', $contentResetPasswordRequest);
 
                 // check ResetPasswordRequestFormType
-                $contentResetPasswordRequestFormType = file_get_contents($runner->getPath('/src/Form/ResetPasswordRequestFormType.php'));
+                $contentResetPasswordRequestFormType = file_get_contents($runner->getPath('/src/Form/ResetPasswordRequestForm.php'));
                 $this->assertStringContainsString('->add(\'emailAddress\', EmailType::class, [', $contentResetPasswordRequestFormType);
                 // check request.html.twig
                 $contentRequestHtml = file_get_contents($runner->getPath('templates/reset_password/request.html.twig'));

diff --git a/tests/fixtures/make-crud/expected/WithCustomRepository.php b/tests/fixtures/make-crud/expected/WithCustomRepository.php
@@ -3,7 +3,7 @@
 namespace App\Controller;
 
 use App\Entity\SweetFood;
-use App\Form\SweetFoodType;
+use App\Form\SweetFoodForm;
 use App\Repository\SweetFoodRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -26,7 +26,7 @@ public function index(SweetFoodRepository $sweetFoodRepository): Response
     public function new(Request $request, EntityManagerInterface $entityManager): Response
     {
         $sweetFood = new SweetFood();
-        $form = $this->createForm(SweetFoodType::class, $sweetFood);
+        $form = $this->createForm(SweetFoodForm::class, $sweetFood);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -53,7 +53,7 @@ public function show(SweetFood $sweetFood): Response
     #[Route('/{id}/edit', name: 'app_sweet_food_edit', methods: ['GET', 'POST'])]
     public function edit(Request $request, SweetFood $sweetFood, EntityManagerInterface $entityManager): Response
     {
-        $form = $this->createForm(SweetFoodType::class, $sweetFood);
+        $form = $this->createForm(SweetFoodForm::class, $sweetFood);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {

diff --git a/tests/fixtures/make-crud/tests/it_generates_basic_crud.php b/tests/fixtures/make-crud/tests/it_generates_basic_crud.php
@@ -22,7 +22,7 @@ public function testIndexAction()
         $this->assertStringContainsString('New SweetFood', $client->getResponse()->getContent());
 
         $newForm = $crawler->selectButton('Save')->form();
-        $client->submit($newForm, ['sweet_food[title]' => 'Candy']);
+        $client->submit($newForm, ['sweet_food_form[title]' => 'Candy']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();
@@ -38,7 +38,7 @@ public function testIndexAction()
         $this->assertGreaterThan(0, $crawler->filter('input[type=text]')->count());
 
         $editForm = $crawler->selectButton('Update')->form();
-        $client->submit($editForm, ['sweet_food[title]' => 'Candy edited']);
+        $client->submit($editForm, ['sweet_food_form[title]' => 'Candy edited']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();

diff --git a/tests/fixtures/make-crud/tests/it_generates_crud_with_custom_controller.php b/tests/fixtures/make-crud/tests/it_generates_crud_with_custom_controller.php
@@ -22,7 +22,7 @@ public function testIndexAction()
         $this->assertStringContainsString('New SweetFood', $client->getResponse()->getContent());
 
         $newForm = $crawler->selectButton('Save')->form();
-        $client->submit($newForm, ['sweet_food[title]' => 'Candy']);
+        $client->submit($newForm, ['sweet_food_form[title]' => 'Candy']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();
@@ -38,7 +38,7 @@ public function testIndexAction()
         $this->assertGreaterThan(0, $crawler->filter('input[type=text]')->count());
 
         $editForm = $crawler->selectButton('Update')->form();
-        $client->submit($editForm, ['sweet_food[title]' => 'Candy edited']);
+        $client->submit($editForm, ['sweet_food_form[title]' => 'Candy edited']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();

diff --git a/tests/fixtures/make-crud/tests/it_generates_crud_with_custom_root_namespace.php b/tests/fixtures/make-crud/tests/it_generates_crud_with_custom_root_namespace.php
@@ -22,7 +22,7 @@ public function testIndexAction()
         $this->assertStringContainsString('New SweetFood', $client->getResponse()->getContent());
 
         $newForm = $crawler->selectButton('Save')->form();
-        $client->submit($newForm, ['sweet_food[title]' => 'Candy']);
+        $client->submit($newForm, ['sweet_food_form[title]' => 'Candy']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();
@@ -38,7 +38,7 @@ public function testIndexAction()
         $this->assertGreaterThan(0, $crawler->filter('input[type=text]')->count());
 
         $editForm = $crawler->selectButton('Update')->form();
-        $client->submit($editForm, ['sweet_food[title]' => 'Candy edited']);
+        $client->submit($editForm, ['sweet_food_form[title]' => 'Candy edited']);
         $this->assertTrue($client->getResponse()->isRedirect());
 
         $crawler = $client->followRedirect();

diff --git a/tests/fixtures/make-form/tests/it_generates_basic_form.php b/tests/fixtures/make-form/tests/it_generates_basic_form.php
@@ -2,7 +2,7 @@
 
 namespace App\Tests;
 
-use App\Form\FooBarType;
+use App\Form\FooBarForm;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 class GeneratedFormTest extends TypeTestCase
@@ -13,7 +13,7 @@ public function testGeneratedForm()
             'field_name' => 'field_value',
         ];
 
-        $form = $this->factory->create(FooBarType::class);
+        $form = $this->factory->create(FooBarForm::class);
         $form->submit($formData);
 
         $this->assertTrue($form->isSynchronized());

diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_embeddable_entity.php b/tests/fixtures/make-form/tests/it_generates_form_with_embeddable_entity.php
@@ -3,7 +3,7 @@
 namespace App\Tests;
 
 use App\Entity\Food;
-use App\Form\FoodType;
+use App\Form\FoodForm;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 class GeneratedFormTest extends TypeTestCase
@@ -14,7 +14,7 @@ public function testGeneratedForm()
             'title' => 'lemon',
         ];
 
-        $form = $this->factory->create(FoodType::class);
+        $form = $this->factory->create(FoodForm::class);
         $form->submit($formData);
 
         $object = new Food();