[make:form] suffix with "Form" instead of "Type"

kbond · kbond · commit d4992f4a6a12 · 2025-04-25T11:31:14.000-04:00
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/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/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/Form.tpl.php b/templates/form/Form.tpl.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/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();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_entity.php b/tests/fixtures/make-form/tests/it_generates_form_with_entity.php
@@ -3,7 +3,7 @@
 namespace App\Tests;
 
 use App\Entity\SourFood;
-use App\Form\SourFoodType;
+use App\Form\SourFoodForm;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 class GeneratedFormTest extends TypeTestCase
@@ -14,7 +14,7 @@ public function testGeneratedForm()
             'title' => 'lemon',
         ];
 
-        $form = $this->factory->create(SourFoodType::class);
+        $form = $this->factory->create(SourFoodForm::class);
         $form->submit($formData);
 
         $object = new SourFood();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_many_to_many_relation.php b/tests/fixtures/make-form/tests/it_generates_form_with_many_to_many_relation.php
@@ -4,7 +4,7 @@
 
 use App\Entity\Library;
 use App\Entity\Book;
-use App\Form\BookType;
+use App\Form\BookForm;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
@@ -23,7 +23,7 @@ class GeneratedFormTest extends TypeTestCase
      */
     public function testGeneratedFormWithMultipleChoices($formData, $collection)
     {
-        $form = $this->factory->create(BookType::class);
+        $form = $this->factory->create(BookForm::class);
         $form->submit($formData);
 
         $object = new Book();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_many_to_one_relation.php b/tests/fixtures/make-form/tests/it_generates_form_with_many_to_one_relation.php
@@ -4,7 +4,7 @@
 
 use App\Entity\Author;
 use App\Entity\Book;
-use App\Form\BookType;
+use App\Form\BookForm;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -26,7 +26,7 @@ public function testGeneratedForm()
             'author' => 0,
         ];
 
-        $form = $this->factory->create(BookType::class);
+        $form = $this->factory->create(BookForm::class);
         $form->submit($formData);
 
         $object = new Book();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_non_entity_dto.php b/tests/fixtures/make-form/tests/it_generates_form_with_non_entity_dto.php
@@ -12,7 +12,7 @@
 namespace App\Tests;
 
 use App\Form\Data\TaskData;
-use App\Form\TaskType;
+use App\Form\TaskForm;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 class GeneratedFormTest extends TypeTestCase
@@ -28,7 +28,7 @@ public function testGeneratedForm()
 
         $objectToCompare = new TaskData();
 
-        $form = $this->factory->create(TaskType::class, $objectToCompare);
+        $form = $this->factory->create(TaskForm::class, $objectToCompare);
         $form->submit($formData);
 
         $object = new TaskData();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_one_to_many_relation.php b/tests/fixtures/make-form/tests/it_generates_form_with_one_to_many_relation.php
@@ -4,7 +4,7 @@
 
 use App\Entity\Author;
 use App\Entity\Book;
-use App\Form\AuthorType;
+use App\Form\AuthorForm;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
@@ -16,7 +16,7 @@ public function testGeneratedForm()
             'name' => 'foo',
         ];
 
-        $form = $this->factory->create(AuthorType::class);
+        $form = $this->factory->create(AuthorForm::class);
         $form->submit($formData);
 
         $object = new Author();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_one_to_one_relation.php b/tests/fixtures/make-form/tests/it_generates_form_with_one_to_one_relation.php
@@ -4,7 +4,7 @@
 
 use App\Entity\Librarian;
 use App\Entity\Library;
-use App\Form\LibraryType;
+use App\Form\LibraryForm;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -26,7 +26,7 @@ public function testGeneratedForm()
             'librarian' => 0,
         ];
 
-        $form = $this->factory->create(LibraryType::class);
+        $form = $this->factory->create(LibraryForm::class);
         $form->submit($formData);
 
         $object = new Library();
diff --git a/tests/fixtures/make-form/tests/it_generates_form_with_single_table_inheritance_entity.php b/tests/fixtures/make-form/tests/it_generates_form_with_single_table_inheritance_entity.php
@@ -3,7 +3,7 @@
 namespace App\Tests;
 
 use App\Entity\SourFood;
-use App\Form\SourFoodType;
+use App\Form\SourFoodForm;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 class GeneratedFormTest extends TypeTestCase
@@ -14,7 +14,7 @@ public function testGeneratedForm()
             'title' => 'lemon',
         ];
 
-        $form = $this->factory->create(SourFoodType::class);
+        $form = $this->factory->create(SourFoodForm::class);
         $form->submit($formData);
 
         $object = new SourFood();
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php
@@ -3,7 +3,7 @@
 namespace App\Controller;
 
 use App\Entity\User;
-use App\Form\RegistrationFormType;
+use App\Form\RegistrationForm;
 use App\Security\StubAuthenticator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -19,7 +19,7 @@ class RegistrationController extends AbstractController
     public function register(Request $request, UserPasswordHasherInterface $userPasswordHasher, Security $security, EntityManagerInterface $entityManager): Response
     {
         $user = new User();
-        $form = $this->createForm(RegistrationFormType::class, $user);
+        $form = $this->createForm(RegistrationForm::class, $user);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php
@@ -3,7 +3,7 @@
 namespace App\Controller;
 
 use App\Entity\User;
-use App\Form\RegistrationFormType;
+use App\Form\RegistrationForm;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -18,7 +18,7 @@ class RegistrationController extends AbstractController
     public function register(Request $request, UserPasswordHasherInterface $userPasswordHasher, Security $security, EntityManagerInterface $entityManager): Response
     {
         $user = new User();
-        $form = $this->createForm(RegistrationFormType::class, $user);
+        $form = $this->createForm(RegistrationForm::class, $user);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php
@@ -3,7 +3,7 @@
 namespace App\Controller;
 
 use App\Entity\User;
-use App\Form\RegistrationFormType;
+use App\Form\RegistrationForm;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,7 +17,7 @@ class RegistrationController extends AbstractController
     public function register(Request $request, UserPasswordHasherInterface $userPasswordHasher, EntityManagerInterface $entityManager): Response
     {
         $user = new User();
-        $form = $this->createForm(RegistrationFormType::class, $user);
+        $form = $this->createForm(RegistrationForm::class, $user);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ public function configureDependencies(DependencyBuilder $dependencies): void`
`548`	`548`	`private function generateFormClass(ClassNameDetails $userClassDetails, Generator $generator, string $usernameField): ClassNameDetails`
`549`	`549`	`{`
`550`	`550`	`$formClassDetails = $generator->createClassNameDetails(`
`551`		`- 'RegistrationFormType',`
	`551`	`+ 'RegistrationForm',`
`552`	`552`	`'Form\\'`
`553`	`553`	`);`
`554`	`554`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function render(ClassNameDetails $formClassDetails, array $formFields, ?C`
`70`	`70`
`71`	`71`	`$this->generator->generateClass(`
`72`	`72`	`$formClassDetails->getFullName(),`
`73`		`- 'form/Type.tpl.php',`
	`73`	`+ 'form/Form.tpl.php',`
`74`	`74`	`[`
`75`	`75`	`'use_statements' => $useStatements,`
`76`	`76`	`'bounded_class_name' => $boundClassDetails ? $boundClassDetails->getShortName() : null,`