fix security logout fixture

Author: jrushlow

src/Maker/MakeForgottenPassword.php

@@ -15,23 +15,23 @@
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Doctrine\ORMDependencyBuilder;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
+use Symfony\Bundle\MakerBundle\FileManager;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
+use Symfony\Bundle\MakerBundle\Renderer\FormTypeRenderer;
 use Symfony\Bundle\MakerBundle\Security\InteractiveSecurityHelper;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Bundle\MakerBundle\FileManager;
-use Symfony\Bundle\MakerBundle\Renderer\FormTypeRenderer;
 use Symfony\Component\Validator\Validation;
-use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
 
 /**
  * @author Romaric Drigon <[email protected]>

src/Renderer/FormTypeRenderer.php

@@ -42,14 +42,17 @@ public function render(ClassNameDetails $formClassDetails, array $formFields, Cl
             $fields[$name] = $fieldTypeOptions;
         }
 
+        $mergedTypeUseStatements = array_merge($fieldTypeUseStatements, $extraUseClasses);
+        sort($mergedTypeUseStatements);
+
         $this->generator->generateClass(
             $formClassDetails->getFullName(),
             'form/Type.tpl.php',
             [
                 'bounded_full_class_name' => $boundClassDetails ? $boundClassDetails->getFullName() : null,
                 'bounded_class_name' => $boundClassDetails ? $boundClassDetails->getShortName() : null,
                 'form_fields' => $fields,
-                'field_type_use_statements' => array_merge($fieldTypeUseStatements, $extraUseClasses),
+                'field_type_use_statements' => $mergedTypeUseStatements,
                 'constraint_use_statements' => $constraintClasses,
             ]
         );

src/Resources/skeleton/forgottenPassword/ForgottenPasswordController.tpl.php

@@ -106,15 +106,15 @@ public function reset(Request $request, UserPasswordEncoderInterface $passwordEn
             throw $this->createNotFoundException();
         }
 
-        $passwordResetToken = $this->getDoctrine()->getRepository(PasswordResetToken::class)->findOneBy([
-            'selector' => substr($tokenAndSelector, 0, PasswordResetToken::SELECTOR_LENGTH),
+        $passwordResetToken = $this->getDoctrine()->getRepository(<?= $token_class_name ?>::class)->findOneBy([
+            'selector' => substr($tokenAndSelector, 0, <?= $token_class_name ?>::SELECTOR_LENGTH),
         ]);
 
         if (!$passwordResetToken) {
             throw $this->createNotFoundException();
         }
 
-        if ($passwordResetToken->isExpired() || !$passwordResetToken->isTokenEquals(substr($tokenAndSelector, PasswordResetToken::SELECTOR_LENGTH))) {
+        if ($passwordResetToken->isExpired() || !$passwordResetToken->isTokenEquals(substr($tokenAndSelector, <?= $token_class_name ?>::SELECTOR_LENGTH))) {
             $this->getDoctrine()->getManager()->remove($passwordResetToken);
             $this->getDoctrine()->getManager()->flush();
 
@@ -125,7 +125,7 @@ public function reset(Request $request, UserPasswordEncoderInterface $passwordEn
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            // A PasswordResetToken should be used only once, remove it.
+            // A <?= $token_class_name ?> should be used only once, remove it.
             $this->getDoctrine()->getManager()->remove($passwordResetToken);
 
             // Encode the plain password, and set it.

src/Security/SecurityControllerBuilder.php

@@ -71,7 +71,7 @@ public function addLogoutMethod(ClassSourceManipulator $manipulator)
         $manipulator->addUseStatementIfNecessary(Route::class);
         $manipulator->addMethodBody($logoutMethodBuilder, <<<'CODE'
 <?php
-throw new \Exception('This method can be blank - it will be intercepted by the logout key on your firewall');
+throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
 CODE
         );
         $manipulator->addMethodBuilder($logoutMethodBuilder);

tests/Maker/MakeForgottenPasswordTest.php

@@ -21,6 +21,7 @@ public function getTestDetails()
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeForgottenPassword')
             ->configureDatabase()
             ->updateSchemaAfterCommand()
+            ->addExtraDependencies('symfony/swiftmailer-bundle')
         ];
     }
 }

tests/Security/fixtures/expected/SecurityController_login_logout.php

@@ -31,6 +31,6 @@ public function login(AuthenticationUtils $authenticationUtils): Response
      */
     public function logout()
     {
-        throw new \Exception('This method can be blank - it will be intercepted by the logout key on your firewall');
+        throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
     }
 }

tests/Security/fixtures/expected/SecurityController_logout.php

@@ -12,6 +12,6 @@ class SecurityController extends AbstractController
      */
     public function logout()
     {
-        throw new \Exception('This method can be blank - it will be intercepted by the logout key on your firewall');
+        throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
     }
 }