feature #1714 [make:form] suffix with "Type" instead of "Form" (revert) (kbond)

This PR was merged into the 1.x branch.

Discussion
----------

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

This reverts commit 6456718.

Fixes: #1711
Fixes: #1698
Fixes: #1697

#1711 makes a good argument for reverting this change.

Commits
-------

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

Author: kbond

config/help/MakeForm.txt

@@ -1,16 +1,16 @@
 The <info>%command.name%</info> command generates a new form class.
 
-<info>php %command.full_name% UserForm</info>
+<info>php %command.full_name% UserType</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% UserForm User</info>
+<info>php %command.full_name% UserType 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% UserForm \\App\\Dto\\UserData</info>
+<info>php %command.full_name% UserType \\App\\Dto\\UserData</info>
 

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 ?: ''),
+                $entityClassDetails->getRelativeNameWithoutSuffix().($iter ?: '').'Type',
                 'Form\\',
-                'Form'
+                'Type'
             );
             ++$iter;
         } while (class_exists($formClassDetails->getFullName()));

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>%Form</>)', Str::asClassName(Str::getRandomTerm())))
+            ->addArgument('name', InputArgument::OPTIONAL, \sprintf('The name of the form class (e.g. <fg=yellow>%sType</>)', 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\\',
-            'Form'
+            'Type'
         );
 
         $formFields = ['field_name' => null];

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(
-            'RegistrationForm',
+            'RegistrationFormType',
             'Form\\'
         );
 

src/Maker/MakeResetPassword.php

@@ -227,12 +227,12 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         );
 
         $requestFormTypeClassNameDetails = $generator->createClassNameDetails(
-            'ResetPasswordRequestForm',
+            'ResetPasswordRequestFormType',
             'Form\\'
         );
 
         $changePasswordFormTypeClassNameDetails = $generator->createClassNameDetails(
-            'ChangePasswordForm',
+            'ChangePasswordFormType',
             'Form\\'
         );
 
@@ -301,7 +301,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $generator->generateClass(
             $requestFormTypeClassNameDetails->getFullName(),
-            'resetPassword/ResetPasswordRequestForm.tpl.php',
+            'resetPassword/ResetPasswordRequestFormType.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/ChangePasswordForm.tpl.php',
+            'resetPassword/ChangePasswordFormType.tpl.php',
             ['use_statements' => $useStatements]
         );
 

src/Renderer/FormTypeRenderer.php

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

templates/form/Form.tpl.php renamed to templates/form/Type.tpl.php

@@ -39,7 +39,7 @@ public function getTestDetails(): \Generator
                 ]);
 
                 $this->assertStringContainsString('src/Controller/SweetFoodController.php', $output);
-                $this->assertStringContainsString('src/Form/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.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/SweetFoodForm.php', $output);
+                $this->assertStringContainsString('src/Form/SweetFoodType.php', $output);
 
                 $this->runCrudTest($runner, 'it_generates_basic_crud.php');
             }),