Refactor dashboard URLs in controllers

Author: codedmonkey

src/Controller/Dashboard/DashboardAccountController.php

@@ -6,7 +6,6 @@
 use CodedMonkey\Dirigent\Doctrine\Repository\UserRepository;
 use CodedMonkey\Dirigent\Form\AccountFormType;
 use CodedMonkey\Dirigent\Form\ChangePasswordFormType;
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
@@ -18,13 +17,6 @@
 
 class DashboardAccountController extends AbstractController
 {
-    public static function getSubscribedServices(): array
-    {
-        return array_merge(parent::getSubscribedServices(), [
-            AdminUrlGenerator::class => AdminUrlGenerator::class,
-        ]);
-    }
-
     public function __construct(
         private readonly UserRepository $userRepository,
         private readonly UserPasswordHasherInterface $passwordHasher,
@@ -45,9 +37,7 @@ public function account(Request $request, #[CurrentUser] User $user): Response
 
             $this->addFlash('success', 'Your account was successfully updated.');
 
-            $url = $this->container->get(AdminUrlGenerator::class)->setRoute('dashboard_account')->generateUrl();
-
-            return $this->redirect($url);
+            return $this->redirectToRoute('dashboard_account');
         }
 
         $passwordForm->handleRequest($request);
@@ -66,9 +56,7 @@ public function account(Request $request, #[CurrentUser] User $user): Response
 
                 $this->addFlash('success', 'Your password was successfully updated.');
 
-                $url = $this->container->get(AdminUrlGenerator::class)->setRoute('dashboard_account')->generateUrl();
-
-                return $this->redirect($url);
+                return $this->redirectToRoute('dashboard_account');
             }
         }
 

src/Controller/Dashboard/DashboardPackagesController.php

@@ -238,7 +238,7 @@ public function addVcsRepository(Request $request): Response
 
             $this->messenger->dispatch(new UpdatePackage($package->getId()));
 
-            return $this->redirect($this->adminUrlGenerator->setRoute('dashboard_packages')->generateUrl());
+            return $this->redirectToRoute('dashboard_packages');
         }
 
         return $this->render('dashboard/packages/add_vcs.html.twig', [
@@ -263,7 +263,7 @@ public function edit(Request $request, string $packageName): Response
 
             $this->messenger->dispatch(new UpdatePackage($package->getId()));
 
-            return $this->redirect($this->adminUrlGenerator->setRoute('dashboard_packages_info', ['packageName' => $package->getName()])->generateUrl());
+            return $this->redirectToRoute('dashboard_packages_info', ['packageName' => $package->getName()]);
         }
 
         return $this->render('dashboard/packages/package_edit.html.twig', [
@@ -280,7 +280,7 @@ public function update(string $packageName): Response
 
         $this->messenger->dispatch(new UpdatePackage($package->getId(), forceRefresh: true));
 
-        return $this->redirect($this->adminUrlGenerator->setRoute('dashboard_packages_info', ['packageName' => $package->getName()])->generateUrl());
+        return $this->redirectToRoute('dashboard_packages_info', ['packageName' => $package->getName()]);
     }
 
     #[Route('/packages/{packageName}/delete', name: 'dashboard_packages_delete', requirements: ['packageName' => '[a-z0-9_.-]+/[a-z0-9_.-]+'])]
@@ -291,6 +291,6 @@ public function delete(string $packageName): Response
 
         $this->packageRepository->remove($package, true);
 
-        return $this->redirect($this->adminUrlGenerator->setRoute('dashboard_packages')->generateUrl());
+        return $this->redirectToRoute('dashboard_packages');
     }
 }