Adding plainPassword validation and a few other things

Author: weaverryan

src/Maker/MakeRegistrationForm.php

@@ -27,17 +27,16 @@
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Validation;
 
 /**
  * @author Ryan Weaver <[email protected]>
+ *
+ * @internal
  */
 final class MakeRegistrationForm extends AbstractMaker
 {
@@ -63,12 +62,6 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
     {
         $command
             ->setDescription('Creates a new registration form system')
-            ->addArgument('user-class', InputArgument::OPTIONAL, 'Full user class')
-            ->addArgument('username-field', InputArgument::OPTIONAL, 'Field on your User class used to login')
-            ->addArgument('password-field', InputArgument::OPTIONAL, 'Field on your User class that stores the hashed password')
-            ->addOption('auto-login-authenticator', null, InputOption::VALUE_REQUIRED, 'Authenticator class to use for logging in')
-            ->addOption('firewall-name', null, InputOption::VALUE_REQUIRED, 'Firewall key used for authentication')
-            ->addOption('redirect-route-name', null, InputOption::VALUE_REQUIRED, 'Route for redirecting if not authenticating')
             ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeRegistrationForm.txt'))
         ;
 
@@ -79,6 +72,16 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
 
     public function interact(InputInterface $input, ConsoleStyle $io, Command $command)
     {
+        // initialize arguments & commands that are internal (i.e. meant only to be asked)
+        $command
+            ->addArgument('user-class')
+            ->addArgument('username-field')
+            ->addArgument('password-field')
+            ->addOption('auto-login-authenticator')
+            ->addOption('firewall-name')
+            ->addOption('redirect-route-name')
+        ;
+
         $interactiveSecurityHelper = new InteractiveSecurityHelper();
 
         if (!$this->fileManager->fileExists($path = 'config/packages/security.yaml')) {
@@ -154,7 +157,7 @@ private function interactAuthenticatorQuestions(InputInterface $input, ConsoleSt
 
         $input->setOption(
             'auto-login-authenticator',
-            count($authenticatorClasses) === 1 ? $authenticatorClasses[0] : $io->choice(
+            1 === \count($authenticatorClasses) ? $authenticatorClasses[0] : $io->choice(
                 'Which authenticator\'s onAuthenticationSuccess() should be used after logging in?',
                 $authenticatorClasses
             )
@@ -261,17 +264,31 @@ private function generateFormClass(ClassNameDetails $userClassDetails, Generator
             $usernameField => null,
             'plainPassword' => [
                 'type' => PasswordType::class,
-                'options' => [
-                    'mapped' => false,
-                    // TODO - NotBlank constraint
-                ]
+                'options_code' => <<<EOF
+                // instead of being set onto the object directly,
+                // this is read and encoded in the controller
+                'mapped' => false,
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'Please enter a password',
+                    ]),
+                    new Length([
+                        'min' => 6,
+                        'minMessage' => 'Your password should be at least {{ limit }} characters',
+                    ]),
+                ],
+EOF
             ],
         ];
 
         $this->formTypeRenderer->render(
             $formClassDetails,
             $formFields,
-            $userClassDetails
+            $userClassDetails,
+            [
+                'Symfony\Component\Validator\Constraints\NotBlank',
+                'Symfony\Component\Validator\Constraints\Length',
+            ]
         );
 
         return $formClassDetails;

src/Renderer/FormTypeRenderer.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Renderer;
 
 use Symfony\Bundle\MakerBundle\Generator;
@@ -18,12 +27,12 @@ public function __construct(Generator $generator)
         $this->generator = $generator;
     }
 
-    public function render(ClassNameDetails $formClassDetails, array $formFields, ClassNameDetails $boundClassDetails = null)
+    public function render(ClassNameDetails $formClassDetails, array $formFields, ClassNameDetails $boundClassDetails = null, array $constraintClasses = [])
     {
         $fieldTypeUseStatements = [];
         $fields = [];
         foreach ($formFields as $name => $fieldTypeOptions) {
-            $fieldTypeOptions = $fieldTypeOptions ?? ['type' => null, 'options' => []];
+            $fieldTypeOptions = $fieldTypeOptions ?? ['type' => null, 'options_code' => null];
 
             if (isset($fieldTypeOptions['type'])) {
                 $fieldTypeUseStatements[] = $fieldTypeOptions['type'];
@@ -40,7 +49,8 @@ public function render(ClassNameDetails $formClassDetails, array $formFields, Cl
                 'bounded_full_class_name' => $boundClassDetails ? $boundClassDetails->getFullName() : null,
                 'bounded_class_name' => $boundClassDetails ? $boundClassDetails->getShortName() : null,
                 'form_fields' => $fields,
-                'field_type_use_statements' => $fieldTypeUseStatements
+                'field_type_use_statements' => $fieldTypeUseStatements,
+                'constraint_use_statements' => $constraintClasses,
             ]
         );
     }

src/Resources/skeleton/form/Type.tpl.php

@@ -11,22 +11,23 @@
 <?php endforeach; ?>
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+<?php foreach ($constraint_use_statements as $className): ?>
+use <?= $className ?>;
+<?php endforeach; ?>
 
 class <?= $class_name ?> extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
 <?php foreach ($form_fields as $form_field => $typeOptions): ?>
-<?php if (null === $typeOptions['type'] && empty($typeOptions['options'])): ?>
+<?php if (null === $typeOptions['type'] && !$typeOptions['options_code']): ?>
             ->add('<?= $form_field ?>')
-<?php elseif (null !== $typeOptions['type'] && empty($typeOptions['options'])): ?>
+<?php elseif (null !== $typeOptions['type'] && !$typeOptions['options_code']): ?>
             ->add('<?= $form_field ?>', <?= $typeOptions['type'] ?>::class)
 <?php else: ?>
             ->add('<?= $form_field ?>', <?= $typeOptions['type'] ? ($typeOptions['type'].'::class') : 'null' ?>, [
-<?php foreach ($typeOptions['options'] as $key => $val): ?>
-                '<?= $key; ?>' => <?= var_export($val, true) ?>,
-<?php endforeach; ?>
+<?= $typeOptions['options_code'] ?>
             ])
 <?php endif; ?>
 <?php endforeach; ?>

tests/fixtures/MakeRegistrationFormEntity/tests/RegistrationFormTest.php

@@ -9,7 +9,7 @@
 
 class RegistrationFormTest extends WebTestCase
 {
-    public function testGeneratedEntity()
+    public function testRegistrationSuccessful()
     {
         self::bootKernel();
         /** @var EntityManager $em */
@@ -31,4 +31,36 @@ public function testGeneratedEntity()
         $this->assertSame(200, $client->getResponse()->getStatusCode());
         $this->assertSame('Page Success', $client->getResponse()->getContent());
     }
+
+    public function testRegistrationValidationError()
+    {
+        self::bootKernel();
+        /** @var EntityManager $em */
+        $em = self::$kernel->getContainer()
+            ->get('doctrine')
+            ->getManager();
+        $em->createQuery('DELETE FROM App\\Entity\\User u')
+            ->execute();
+        $user = new User();
+        $user->setEmail('[email protected]');
+        $user->setPassword('abc-fake-encoded');
+        $em->persist($user);
+        $em->flush();
+
+        $client = static::createClient();
+        $crawler = $client->request('GET', '/register');
+        $form = $crawler->selectButton('Register')->form();
+        $form['registration_form[email]'] = '[email protected]';
+        $form['registration_form[password]'] = 'foo';
+        $client->submit($form);
+
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->assertContains(
+            'Your password should be at least 6 characters',
+            $client->getResponse()->getContent()
+        );
+        $client->followRedirect();
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+        $this->assertSame('Page Success', $client->getResponse()->getContent());
+    }
 }

tests/fixtures/MakeRegistrationFormNoGuessing/src/Security/AuthenticatorFirst.php

@@ -4,4 +4,4 @@
 
 class AuthenticatorFirst
 {
-}
+}

tests/fixtures/MakeRegistrationFormNoGuessing/src/Security/AuthenticatorSecond.php

@@ -4,4 +4,4 @@
 
 class AuthenticatorSecond
 {
-}
+}