From 75532b5fcab2719a5f9285858d18d751b1e6bfe3 Mon Sep 17 00:00:00 2001
From: Jesse Rushlow <jr@geeshoe.com>
Date: Fri, 30 Oct 2020 12:17:56 -0400
Subject: [PATCH] php8 attributes support for generated controllers

---
 src/Maker/AbstractMaker.php                   |  5 ++++
 src/Maker/MakeController.php                  |  1 +
 src/Maker/MakeCrud.php                        |  1 +
 src/Maker/MakeRegistrationForm.php            |  1 +
 src/Maker/MakeResetPassword.php               |  1 +
 .../skeleton/controller/Controller.tpl.php    |  4 ++++
 .../crud/controller/Controller.tpl.php        | 24 +++++++++++++++++++
 .../RegistrationController.tpl.php            |  8 +++++++
 .../ResetPasswordController.tpl.php           | 19 +++++++++++++++
 9 files changed, 64 insertions(+)

diff --git a/src/Maker/AbstractMaker.php b/src/Maker/AbstractMaker.php
index 3d5a84841..8017aa012 100644
--- a/src/Maker/AbstractMaker.php
+++ b/src/Maker/AbstractMaker.php
@@ -48,4 +48,9 @@ protected function addDependencies(array $dependencies, string $message = null):
             $message
         );
     }
+
+    final protected function useAttributes(): bool
+    {
+        return \PHP_VERSION_ID >= 80000;
+    }
 }
diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php
index be4ef1c2e..fc769f635 100644
--- a/src/Maker/MakeController.php
+++ b/src/Maker/MakeController.php
@@ -58,6 +58,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $controllerClassNameDetails->getFullName(),
             'controller/Controller.tpl.php',
             [
+                'use_attributes' => $this->useAttributes(),
                 'route_path' => Str::asRoutePath($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
                 'route_name' => Str::asRouteName($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
                 'with_template' => $this->isTwigInstalled() && !$noTemplate,
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
index be56c00a6..de4b9a89a 100644
--- a/src/Maker/MakeCrud.php
+++ b/src/Maker/MakeCrud.php
@@ -143,6 +143,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $controllerClassDetails->getFullName(),
             'crud/controller/Controller.tpl.php',
             array_merge([
+                    'use_attributes' => $this->useAttributes(),
                     'entity_full_class_name' => $entityClassDetails->getFullName(),
                     'entity_class_name' => $entityClassDetails->getShortName(),
                     'form_full_class_name' => $formClassDetails->getFullName(),
diff --git a/src/Maker/MakeRegistrationForm.php b/src/Maker/MakeRegistrationForm.php
index 17d1a7cb0..84791959f 100644
--- a/src/Maker/MakeRegistrationForm.php
+++ b/src/Maker/MakeRegistrationForm.php
@@ -258,6 +258,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $controllerClassNameDetails->getFullName(),
             'registration/RegistrationController.tpl.php',
             [
+                'use_attributes' => $this->useAttributes(),
                 'route_path' => '/register',
                 'route_name' => 'app_register',
                 'form_class_name' => $formClassDetails->getShortName(),
diff --git a/src/Maker/MakeResetPassword.php b/src/Maker/MakeResetPassword.php
index b3de79c45..8a8df6800 100644
--- a/src/Maker/MakeResetPassword.php
+++ b/src/Maker/MakeResetPassword.php
@@ -197,6 +197,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $controllerClassNameDetails->getFullName(),
             'resetPassword/ResetPasswordController.tpl.php',
             [
+                'use_attributes' => $this->useAttributes(),
                 'user_full_class_name' => $userClassNameDetails->getFullName(),
                 'user_class_name' => $userClassNameDetails->getShortName(),
                 'request_form_type_full_class_name' => $requestFormTypeClassNameDetails->getFullName(),
diff --git a/src/Resources/skeleton/controller/Controller.tpl.php b/src/Resources/skeleton/controller/Controller.tpl.php
index 7a7b6345a..1968e1753 100644
--- a/src/Resources/skeleton/controller/Controller.tpl.php
+++ b/src/Resources/skeleton/controller/Controller.tpl.php
@@ -8,9 +8,13 @@
 
 class <?= $class_name; ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
+<?php if ($use_attributes) { ?>
+    #[Route('<?= $route_path ?>', name: '<?= $route_name ?>')]
+<?php } else { ?>
     /**
      * @Route("<?= $route_path ?>", name="<?= $route_name ?>")
      */
+<?php } ?>
     public function index(): Response
     {
 <?php if ($with_template) { ?>
diff --git a/src/Resources/skeleton/crud/controller/Controller.tpl.php b/src/Resources/skeleton/crud/controller/Controller.tpl.php
index 24b07a445..d17a3e867 100644
--- a/src/Resources/skeleton/crud/controller/Controller.tpl.php
+++ b/src/Resources/skeleton/crud/controller/Controller.tpl.php
@@ -12,14 +12,22 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
+<?php if ($use_attributes) { ?>
+#[Route('<?= $route_path ?>')]
+<?php } else { ?>
 /**
  * @Route("<?= $route_path ?>")
  */
+<?php } ?>
 class <?= $class_name ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
+<?php if ($use_attributes) { ?>
+    #[Route('/', name: '<?= $route_name ?>_index', methods: ['GET'])]
+<?php } else { ?>
     /**
      * @Route("/", name="<?= $route_name ?>_index", methods={"GET"})
      */
+<?php } ?>
 <?php if (isset($repository_full_class_name)): ?>
     public function index(<?= $repository_class_name ?> $<?= $repository_var ?>): Response
     {
@@ -40,9 +48,13 @@ public function index(): Response
     }
 <?php endif ?>
 
+<?php if ($use_attributes) { ?>
+    #[Route('/new', name: '<?= $route_name ?>_new', methods: ['GET', 'POST'])]
+<?php } else { ?>
     /**
      * @Route("/new", name="<?= $route_name ?>_new", methods={"GET","POST"})
      */
+<?php } ?>
     public function new(Request $request): Response
     {
         $<?= $entity_var_singular ?> = new <?= $entity_class_name ?>();
@@ -63,9 +75,13 @@ public function new(Request $request): Response
         ]);
     }
 
+<?php if ($use_attributes) { ?>
+    #[Route('/{<?= $entity_identifier ?>}', name: '<?= $route_name ?>_show', methods: ['GET'])]
+<?php } else { ?>
     /**
      * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_show", methods={"GET"})
      */
+<?php } ?>
     public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
         return $this->render('<?= $templates_path ?>/show.html.twig', [
@@ -73,9 +89,13 @@ public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Re
         ]);
     }
 
+<?php if ($use_attributes) { ?>
+    #[Route('/{<?= $entity_identifier ?>}/edit', name: '<?= $route_name ?>_edit', methods: ['GET', 'POST'])]
+<?php } else { ?>
     /**
      * @Route("/{<?= $entity_identifier ?>}/edit", name="<?= $route_name ?>_edit", methods={"GET","POST"})
      */
+<?php } ?>
     public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
         $form = $this->createForm(<?= $form_class_name ?>::class, $<?= $entity_var_singular ?>);
@@ -93,9 +113,13 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
         ]);
     }
 
+<?php if ($use_attributes) { ?>
+    #[Route('/{<?= $entity_identifier ?>}', name: '<?= $route_name ?>_delete', methods: ['DELETE'])]
+<?php } else { ?>
     /**
      * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_delete", methods={"DELETE"})
      */
+<?php } ?>
     public function delete(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
         if ($this->isCsrfTokenValid('delete'.$<?= $entity_var_singular ?>->get<?= ucfirst($entity_identifier) ?>(), $request->request->get('_token'))) {
diff --git a/src/Resources/skeleton/registration/RegistrationController.tpl.php b/src/Resources/skeleton/registration/RegistrationController.tpl.php
index 23f6bb8ce..8b87b5253 100644
--- a/src/Resources/skeleton/registration/RegistrationController.tpl.php
+++ b/src/Resources/skeleton/registration/RegistrationController.tpl.php
@@ -39,9 +39,13 @@ public function __construct(EmailVerifier $emailVerifier)
     }
 
 <?php endif; ?>
+<?php if ($use_attributes) { ?>
+    #[Route('<?= $route_path ?>', name: '<?= $route_name ?>')]
+<?php } else { ?>
     /**
      * @Route("<?= $route_path ?>", name="<?= $route_name ?>")
      */
+<?php } ?>
     public function register(Request $request, UserPasswordEncoderInterface $passwordEncoder<?= $authenticator_full_class_name ? sprintf(', GuardAuthenticatorHandler $guardHandler, %s $authenticator', $authenticator_class_name) : '' ?>): Response
     {
         $user = new <?= $user_class_name ?>();
@@ -91,9 +95,13 @@ public function register(Request $request, UserPasswordEncoderInterface $passwor
     }
 <?php if ($will_verify_email): ?>
 
+<?php if ($use_attributes) { ?>
+    #[Route('/verify/email', name: 'app_verify_email')]
+<?php } else { ?>
     /**
      * @Route("/verify/email", name="app_verify_email")
      */
+<?php } ?>
     public function verifyUserEmail(Request $request): Response
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
diff --git a/src/Resources/skeleton/resetPassword/ResetPasswordController.tpl.php b/src/Resources/skeleton/resetPassword/ResetPasswordController.tpl.php
index 4ceeea91b..df93cffa1 100644
--- a/src/Resources/skeleton/resetPassword/ResetPasswordController.tpl.php
+++ b/src/Resources/skeleton/resetPassword/ResetPasswordController.tpl.php
@@ -18,9 +18,13 @@
 use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface;
 use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface;
 
+<?php if ($use_attributes) { ?>
+#[Route('/reset-password')]
+<?php } else { ?>
 /**
  * @Route("/reset-password")
  */
+<?php } ?>
 class <?= $class_name ?> extends AbstractController
 {
     use ResetPasswordControllerTrait;
@@ -35,8 +39,13 @@ public function __construct(ResetPasswordHelperInterface $resetPasswordHelper)
     /**
      * Display & process form to request a password reset.
      *
+<?php if ($use_attributes) { ?>
+     */
+    #[Route('', name: 'app_forgot_password_request')]
+<?php } else { ?>
      * @Route("", name="app_forgot_password_request")
      */
+<?php } ?>
     public function request(Request $request, MailerInterface $mailer): Response
     {
         $form = $this->createForm(<?= $request_form_type_class_name ?>::class);
@@ -57,8 +66,13 @@ public function request(Request $request, MailerInterface $mailer): Response
     /**
      * Confirmation page after a user has requested a password reset.
      *
+<?php if ($use_attributes) { ?>
+     */
+    #[Route('/check-email', name: 'app_check_email')]
+<?php } else { ?>
      * @Route("/check-email", name="app_check_email")
      */
+<?php } ?>
     public function checkEmail(): Response
     {
         // We prevent users from directly accessing this page
@@ -74,8 +88,13 @@ public function checkEmail(): Response
     /**
      * Validates and process the reset URL that the user clicked in their email.
      *
+<?php if ($use_attributes) { ?>
+     */
+    #[Route('/reset/{token}', name: 'app_reset_password')]
+<?php } else { ?>
      * @Route("/reset/{token}", name="app_reset_password")
      */
+<?php } ?>
     public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, string $token = null): Response
     {
         if ($token) {