sf6 (#84)

Yosimitso · Jul 15, 2024 · 189b693 · 189b693
1 parent 14453f4
commit 189b693
Show file tree

Hide file tree

Showing 107 changed files with 1,545 additions and 8,672 deletions.
diff --git a/Controller/Admin/AdminController.php b/Controller/Admin/AdminController.php
@@ -3,26 +3,18 @@
 namespace Yosimitso\WorkingForumBundle\Controller\Admin;
 
 use Yosimitso\WorkingForumBundle\Controller\BaseController;
+use Symfony\Component\Routing\Attribute\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Response;
 use Yosimitso\WorkingForumBundle\Entity\Forum;
 use Yosimitso\WorkingForumBundle\Entity\PostReport;
 
-/**
- * Class AdminController
- *
- * @package Yosimitso\WorkingForumBundle\Controller\Admin
- *
- * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
- */
+#[Route('/admin')]
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_MODERATOR")')]
 class AdminController extends BaseController
 {
-
-    /** @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     * @return Response
-     * @throws \Exception
-     */
-    public function indexAction()
+    #[Route('', name: 'workingforum_admin')]
+    public function indexAction(): Response
     {
         $list_forum = $this->em->getRepository(Forum::class)->findAll();
 
@@ -58,7 +50,7 @@ public function indexAction()
         );
     }
 
-    private function renderSettings($settingsList)
+    private function renderSettings($settingsList): array
     {
         $settingsHtml = [];
 
@@ -119,7 +111,5 @@ private function renderSettings($settingsList)
         }
 
         return $settingsHtml;
-
     }
-
-}
+}
diff --git a/Controller/Admin/AdminForumController.php b/Controller/Admin/AdminForumController.php
@@ -2,6 +2,8 @@
 
 namespace Yosimitso\WorkingForumBundle\Controller\Admin;
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\Routing\Attribute\Route;
 use Yosimitso\WorkingForumBundle\Controller\BaseController;
 use Yosimitso\WorkingForumBundle\Entity\Forum;
 use Yosimitso\WorkingForumBundle\Entity\Subforum;
@@ -10,24 +12,13 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * Class AdminForumController
- *
- * @package Yosimitso\WorkingForumBundle\Controller\Admin
- *
- * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
- */
+#[Route('/admin/forum')]
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_MODERATOR")')]
 class AdminForumController extends BaseController
 {
-    /**
-     * @Security("is_granted('ROLE_ADMIN')")
-     * @param Request $request
-     * @param int $id
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     * @throws \Exception
-     */
-    public function editAction(Request $request, $id)
+    #[Route('/edit/{id}', name: 'workingforum_admin_forum_edit', requirements: ['id' => '\d+'])]
+    #[Security('is_granted("ROLE_ADMIN")')]
+    public function editAction(Request $request, $id): Response|RedirectResponse
     {
         $forum = $this->em->getRepository(Forum::class)->find($id);
 
@@ -69,14 +60,9 @@ public function editAction(Request $request, $id)
         );
     }
 
-    /**
-     * @Security("is_granted('ROLE_ADMIN')")
-     * @param Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     * @throws \Exception
-     */
-    public function addAction(Request $request)
+    #[Route('/add', name: 'workingforum_admin_forum_add')]
+    #[Security('is_granted("ROLE_ADMIN")')]
+    public function addAction(Request $request): Response|RedirectResponse
     {
         $forum = new Forum;
         $forum->addSubForum(new Subforum);
@@ -110,15 +96,11 @@ public function addAction(Request $request)
         );
     }
 
-    /**
-     * @Security("is_granted('ROLE_ADMIN')")
-     * @param int $forum_id
-     *
-     * @return Response
-     */
-    public function deleteForumAction($forum_id)
+    #[Route('/delete/{forumId}', name: 'workingforum_admin_delete_forum', requirements: ['id' => '\d+'])]
+    #[Security('is_granted("ROLE_ADMIN")')]
+    public function deleteForumAction($forumId): Response
     {
-        $forum = $this->em->getRepository(Forum::class)->findOneById($forum_id);
+        $forum = $this->em->getRepository(Forum::class)->findOneById($forumId);
 
         if (!is_null($forum)) {
             $this->em->remove($forum);

diff --git a/Controller/Admin/AdminReportController.php b/Controller/Admin/AdminReportController.php
@@ -2,6 +2,7 @@
 
 namespace Yosimitso\WorkingForumBundle\Controller\Admin;
 
+use Symfony\Component\Routing\Attribute\Route;
 use Yosimitso\WorkingForumBundle\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Request;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -10,20 +11,11 @@
 use Yosimitso\WorkingForumBundle\Entity\PostReport;
 use Yosimitso\WorkingForumBundle\Entity\UserInterface;
 
-/**
- * Class AdminReportController
- *
- * @package Yosimitso\WorkingForumBundle\Controller\Admin
- *
- * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
- */
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_MODERATOR")')]
 class AdminReportController extends BaseController
 {
-    /**
-     * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     * @return Response
-     */
-    public function reportAction()
+    #[Route('/admin/report', name: 'workingforum_admin_report')]
+    public function reportAction(): Response
     {
         $postReportList = $this->em->getRepository(PostReport::class)
             ->findBy(['processed' => null], ['processed' => 'ASC', 'id' => 'ASC']);
@@ -38,9 +30,8 @@ public function reportAction()
         );
     }
 
-    /**  @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     */
-    public function reportHistoryAction()
+    #[Route('/admin/report/history', name: 'workingforum_admin_report_history')]
+    public function reportHistoryAction(): Response
     {
         $postReportList = $this->em->getRepository(PostReport::class)
             ->findBy(['processed' => 1], ['processed' => 'ASC', 'id' => 'DESC']);
@@ -55,13 +46,8 @@ public function reportHistoryAction()
         );
     }
 
-    /**
-     * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     * @param Request $request
-     *
-     * @return Response
-     */
-    public function reportActionGoodAction(Request $request)
+    #[Route('/admin/reportaction/good', name: 'workingforum_admin_report_action_good')]
+    public function reportActionGoodAction(Request $request): Response
     {
         $id = (int)htmlentities($request->request->get('id'));
 
@@ -77,17 +63,10 @@ public function reportActionGoodAction(Request $request)
         $this->em->flush();
 
         return new Response(json_encode('ok'), 200);
-
     }
 
-
-    /**
-     * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     * @param Request $request
-     *
-     * @return Response
-     */
-    public function reportActionModerateAction(Request $request)
+    #[Route('/admin/reportaction/moderate', name: 'workingforum_admin_report_action_moderate')]
+    public function reportActionModerateAction(Request $request): Response
     {
         $reason = htmlentities($request->request->get('reason'));
         $id = (int)htmlentities($request->request->get('id'));
@@ -127,7 +106,5 @@ public function reportActionModerateAction(Request $request)
         $this->em->flush();
 
         return new Response(json_encode('ok'), 200);
-
     }
-
 }
diff --git a/Controller/Admin/AdminRulesController.php b/Controller/Admin/AdminRulesController.php
@@ -2,6 +2,7 @@
 
 namespace Yosimitso\WorkingForumBundle\Controller\Admin;
 
+use Symfony\Component\Routing\Attribute\Route;
 use Yosimitso\WorkingForumBundle\Controller\BaseController;
 use Yosimitso\WorkingForumBundle\Entity\Rules;
 use Symfony\Component\HttpFoundation\Request;
@@ -10,29 +11,17 @@
 use Yosimitso\WorkingForumBundle\Form\RulesEditType;
 use Yosimitso\WorkingForumBundle\Twig\Extension\SmileyTwigExtension;
 
-/**
- * Class AdminRulesController
- *
- * @package Yosimitso\WorkingForumBundle\Controller\Admin
- *
- * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
- */
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_MODERATOR")')]
 class AdminRulesController extends BaseController
 {
-    /**
-     * @var SmileyTwigExtension
-     */
-    private $smileyTwigExtension;
+    private SmileyTwigExtension $smileyTwigExtension;
 
     public function __construct(SmileyTwigExtension $smileyTwigExtension)
     {
         $this->smileyTwigExtension = $smileyTwigExtension;
     }
 
-    /**
-     *
-     * @return mixed
-     */
+    #[Route('/admin/rules', name: 'workingforum_admin_forum_rules')]
     public function rulesAction()
     {
         $form = $this->createForm(RulesType::class, null);
@@ -45,9 +34,8 @@ public function rulesAction()
         );
     }
 
-    /**
-     * @Security("is_granted('ROLE_ADMIN')")
-     */
+    #[Route('/admin/rules/edit/{lang}', name: 'workingforum_admin_edit_forum_rules')]
+    #[Security('is_granted("ROLE_ADMIN")')]
     public function rulesEditAction(Request $request, $lang)
     {
         $listSmiley = $this->smileyTwigExtension->getListSmiley(); // Smileys available for markdown
@@ -86,9 +74,8 @@ public function rulesEditAction(Request $request, $lang)
         );
     }
 
-    /**
-     * @Security("is_granted('ROLE_ADMIN')")
-     */
+    #[Route('/admin/rules/new/{lang}', name: 'workingforum_admin_new_forum_rules')]
+    #[Security('is_granted("ROLE_ADMIN")')]
     public function rulesNewAction(Request $request, $lang)
     {
         $listSmiley = $this->smileyTwigExtension->getListSmiley(); // Smileys available for markdown
@@ -118,5 +105,4 @@ public function rulesNewAction(Request $request, $lang)
             ]
         );
     }
-
 }
diff --git a/Controller/Admin/AdminUsersController.php b/Controller/Admin/AdminUsersController.php
@@ -2,25 +2,17 @@
 
 namespace Yosimitso\WorkingForumBundle\Controller\Admin;
 
+use Symfony\Component\Routing\Attribute\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Response;
 use Yosimitso\WorkingForumBundle\Controller\BaseController;
 use Yosimitso\WorkingForumBundle\Entity\UserInterface;
 
-/**
- * Class AdminUsersController
- *
- * @package Yosimitso\WorkingForumBundle\Controller\Admin
- *
- * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
- */
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_MODERATOR")')]
 class AdminUsersController extends BaseController
 {
-    /**
-     * @Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_MODERATOR')")
-     * @return Response
-     */
-    public function userListAction()
+    #[Route('/admin/users', name: 'workingforum_admin_user')]
+    public function userListAction(): Response
     {
         $usersList = $this->em->getRepository(UserInterface::class)->findAll();
 
@@ -31,6 +23,5 @@ public function userListAction()
 
             ]
         );
-
     }
 }