adjustments from review

Author: kbond

src/Resources/scaffolds/6.0/bootstrapcss.php

@@ -29,9 +29,6 @@
             return $data;
         });
 
-        // add bootstrap to app.css
-        $files->dumpFile('assets/styles/app.css', "@import \"~bootstrap/dist/css/bootstrap.css\";\n");
-
         // add bootstrap to app.js
         $appJs = $files->getFileContents('assets/app.js');
 

src/Resources/scaffolds/6.0/bootstrapcss/assets/styles/app.css.tpl

@@ -0,0 +1 @@
+@import "~bootstrap/dist/css/bootstrap.css";

src/Resources/scaffolds/6.0/change-password.php

@@ -16,6 +16,5 @@
     ],
     'packages' => [
         'symfony/form' => 'all',
-        'symfony/validator' => 'all',
     ],
 ];

src/Resources/scaffolds/6.0/change-password/src/Controller/ChangePasswordController.php.tpl

@@ -27,7 +27,7 @@ class ChangePasswordController extends AbstractController
             throw new \LogicException('Invalid user type.');
         }
 
-        $form = $this->createForm(ChangePasswordFormType::class, $user);
+        $form = $this->createForm(ChangePasswordFormType::class);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {

src/Resources/scaffolds/6.0/change-password/src/Form/ChangePasswordFormType.php.tpl

@@ -4,7 +4,6 @@ namespace App\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
@@ -20,31 +19,20 @@ class ChangePasswordFormType extends AbstractType
                 'constraints' => [
                     new UserPassword(['message' => 'This is not your current password.']),
                 ],
-                'mapped' => false,
             ])
-            ->add('plainPassword', RepeatedType::class, [
-                'type' => PasswordType::class,
-                'first_options' => [
-                    'attr' => ['autocomplete' => 'new-password'],
-                    'constraints' => [
-                        new NotBlank([
-                            'message' => 'Please enter a password.',
-                        ]),
-                        new Length([
-                            'min' => 6,
-                            'minMessage' => 'Your password should be at least {{ limit }} characters',
-                            // max length allowed by Symfony for security reasons
-                            'max' => 4096,
-                        ]),
-                    ],
-                ],
-                'second_options' => [
-                    'attr' => ['autocomplete' => 'new-password'],
+            ->add('plainPassword', PasswordType::class, [
+                'attr' => ['autocomplete' => 'new-password'],
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'Please enter a password.',
+                    ]),
+                    new Length([
+                        'min' => 6,
+                        'minMessage' => 'Your password should be at least {{ limit }} characters',
+                        // max length allowed by Symfony for security reasons
+                        'max' => 4096,
+                    ]),
                 ],
-                'invalid_message' => 'The password fields must match.',
-                // Instead of being set onto the object directly,
-                // this is read and encoded in the controller
-                'mapped' => false,
             ])
         ;
     }

src/Resources/scaffolds/6.0/change-password/templates/user/change_password.html.twig.tpl

@@ -9,8 +9,7 @@
 
         {{ form_start(changePasswordForm) }}
             {{ form_row(changePasswordForm.currentPassword, {label: 'Current Password'}) }}
-            {{ form_row(changePasswordForm.plainPassword.first, {label: 'New Password'}) }}
-            {{ form_row(changePasswordForm.plainPassword.second, {label: 'Repeat New Password'}) }}
+            {{ form_row(changePasswordForm.plainPassword, {label: 'New Password'}) }}
 
             <button type="submit" class="btn btn-primary">Change Password</button>
         {{ form_end(changePasswordForm) }}

src/Resources/scaffolds/6.0/change-password/tests/Functional/ChangePasswordTest.php.tpl

@@ -27,7 +27,6 @@ final class ChangePasswordTest extends KernelTestCase
             ->visit('/user/change-password')
             ->fillField('Current Password', '1234')
             ->fillField('New Password', 'new-password')
-            ->fillField('Repeat New Password', 'new-password')
             ->click('Change Password')
             ->assertSuccessful()
             ->assertOn('/')
@@ -56,7 +55,6 @@ final class ChangePasswordTest extends KernelTestCase
             ->visit('/user/change-password')
             ->fillField('Current Password', 'invalid')
             ->fillField('New Password', 'new-password')
-            ->fillField('Repeat New Password', 'new-password')
             ->click('Change Password')
             ->assertStatus(422)
             ->assertOn('/user/change-password')
@@ -76,7 +74,6 @@ final class ChangePasswordTest extends KernelTestCase
             ->actingAs($user->object())
             ->visit('/user/change-password')
             ->fillField('New Password', 'new-password')
-            ->fillField('Repeat New Password', 'new-password')
             ->click('Change Password')
             ->assertStatus(422)
             ->assertOn('/user/change-password')
@@ -106,27 +103,6 @@ final class ChangePasswordTest extends KernelTestCase
         $this->assertSame($currentPassword, $user->getPassword());
     }
 
-    public function testNewPasswordsMustMatch(): void
-    {
-        $user = UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
-        $currentPassword = $user->getPassword();
-
-        $this->browser()
-            ->actingAs($user->object())
-            ->visit('/user/change-password')
-            ->fillField('Current Password', '1234')
-            ->fillField('New Password', 'new-password')
-            ->fillField('Repeat New Password', 'different-new-password')
-            ->click('Change Password')
-            ->assertStatus(422)
-            ->assertOn('/user/change-password')
-            ->assertSee('The password fields must match.')
-            ->assertAuthenticated('[email protected]')
-        ;
-
-        $this->assertSame($currentPassword, $user->getPassword());
-    }
-
     public function testCannotAccessChangePasswordPageIfNotLoggedIn(): void
     {
         $this->browser()

src/Resources/scaffolds/6.0/profile.php

@@ -16,6 +16,5 @@
     ],
     'packages' => [
         'symfony/form' => 'all',
-        'symfony/validator' => 'all',
     ],
 ];

src/Resources/scaffolds/6.0/profile/src/Form/ProfileFormType.php.tpl

@@ -6,18 +6,13 @@ use App\Entity\User;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 class ProfileFormType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('name', null, [
-                'constraints' => [
-                    new NotBlank(['message' => 'Name is required']),
-                ],
-            ])
+            ->add('name')
         ;
     }
 

src/Resources/scaffolds/6.0/register.php

@@ -9,36 +9,12 @@
  * file that was distributed with this source code.
  */
 
-use Symfony\Bundle\MakerBundle\FileManager;
-
 return [
     'description' => 'Create registration form and tests.',
     'dependents' => [
         'auth',
     ],
     'packages' => [
         'symfony/form' => 'all',
-        'symfony/validator' => 'all',
     ],
-    'configure' => function (FileManager $files) {
-        $userEntity = $files->getFileContents('src/Entity/User.php');
-
-        if (str_contains($userEntity, $attribute = "#[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]")) {
-            // unique constraint already there
-            return;
-        }
-
-        $userEntity = str_replace(
-            [
-                '#[ORM\Entity(repositoryClass: UserRepository::class)]',
-                'use Doctrine\ORM\Mapping as ORM;',
-            ],
-            [
-                "#[ORM\Entity(repositoryClass: UserRepository::class)]\n{$attribute}",
-                "use Doctrine\ORM\Mapping as ORM;\nuse Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;",
-            ],
-            $userEntity
-        );
-        $files->dumpFile('src/Entity/User.php', $userEntity);
-    },
 ];

src/Resources/scaffolds/6.0/register/src/Form/RegistrationFormType.php.tpl

@@ -8,7 +8,6 @@ use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
@@ -17,17 +16,8 @@ class RegistrationFormType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('name', null, [
-                'constraints' => [
-                    new NotBlank(['message' => 'Name is required']),
-                ],
-            ])
-            ->add('email', EmailType::class, [
-                'constraints' => [
-                    new NotBlank(['message' => 'Email is required']),
-                    new Email(['message' => 'This is not a valid email address']),
-                ],
-            ])
+            ->add('name')
+            ->add('email', EmailType::class)
             ->add('plainPassword', PasswordType::class, [
                 // instead of being set onto the object directly,
                 // this is read and encoded in the controller

src/Resources/scaffolds/6.0/reset-password.php

@@ -18,7 +18,6 @@
     ],
     'packages' => [
         'symfony/form' => 'all',
-        'symfony/validator' => 'all',
         'symfony/mailer' => 'all',
         'symfonycasts/reset-password-bundle' => 'all',
         'zenstruck/mailer-test' => 'dev',

src/Resources/scaffolds/6.0/reset-password/src/Form/ResetPasswordFormType.php.tpl

@@ -4,7 +4,6 @@ namespace App\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
@@ -15,35 +14,24 @@ class ResetPasswordFormType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('plainPassword', RepeatedType::class, [
-                'type' => PasswordType::class,
-                'first_options' => [
-                    'attr' => ['autocomplete' => 'new-password'],
-                    'constraints' => [
-                        new NotBlank([
-                            'message' => 'Please enter a password',
-                        ]),
-                        new Length([
-                            'min' => 6,
-                            'minMessage' => 'Your password should be at least {{ limit }} characters',
-                            // max length allowed by Symfony for security reasons
-                            'max' => 4096,
-                        ]),
-                    ],
+            ->add('plainPassword', PasswordType::class, [
+                'attr' => ['autocomplete' => 'new-password'],
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'Please enter a password',
+                    ]),
+                    new Length([
+                        'min' => 6,
+                        'minMessage' => 'Your password should be at least {{ limit }} characters',
+                        // max length allowed by Symfony for security reasons
+                        'max' => 4096,
+                    ]),
                 ],
-                'second_options' => [
-                    'attr' => ['autocomplete' => 'new-password'],
-                ],
-                'invalid_message' => 'The password fields must match.',
-                // Instead of being set onto the object directly,
-                // this is read and encoded in the controller
-                'mapped' => false,
             ])
         ;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults([]);
     }
 }

src/Resources/scaffolds/6.0/reset-password/templates/reset_password/reset.html.twig.tpl

@@ -8,8 +8,7 @@
         <h1>Reset your password</h1>
 
         {{ form_start(resetForm) }}
-            {{ form_row(resetForm.plainPassword.first, {label: 'New Password'}) }}
-            {{ form_row(resetForm.plainPassword.second, {label: 'Repeat New Password'}) }}
+            {{ form_row(resetForm.plainPassword, {label: 'New Password'}) }}
             <button class="btn btn-primary">Reset password</button>
         {{ form_end(resetForm) }}
     </div>

src/Resources/scaffolds/6.0/reset-password/tests/Functional/ResetPasswordTest.php.tpl

@@ -52,7 +52,6 @@ final class ResetPasswordTest extends KernelTestCase
         $this->browser()
             ->visit($resetUrl)
             ->fillField('New Password', 'new-password')
-            ->fillField('Repeat New Password', 'new-password')
             ->click('Reset password')
             ->assertOn('/')
             ->assertSeeIn('.alert', 'Your password was successfully reset, you are now logged in.')

src/Resources/scaffolds/6.0/user.php

@@ -15,6 +15,7 @@
         'doctrine/orm' => 'all',
         'doctrine/doctrine-bundle' => 'all',
         'symfony/security-bundle' => 'all',
+        'symfony/validator' => 'all',
         'phpunit/phpunit' => 'dev',
         'symfony/phpunit-bridge' => 'dev',
         'zenstruck/foundry' => 'dev',

src/Resources/scaffolds/6.0/user/src/Entity/User.php.tpl

@@ -4,10 +4,13 @@ namespace App\Entity;
 
 use App\Repository\UserRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Validator\Constraints as Assert;
 
 #[ORM\Entity(repositoryClass: UserRepository::class)]
+#[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
@@ -16,9 +19,12 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     private ?int $id = null;
 
     #[ORM\Column(unique: true)]
+    #[Assert\NotBlank(message: 'Email is required')]
+    #[Assert\Email(message: 'This is not a valid email address')]
     private ?string $email = null;
 
     #[ORM\Column]
+    #[Assert\NotBlank(message: 'Name is required')]
     private ?string $name = null;
 
     #[ORM\Column(type: 'json')]