Merge branch 'easyadmin-routes'

Author: codedmonkey

src/Controller/Dashboard/DashboardPackagesController.php

@@ -14,8 +14,9 @@
 use CodedMonkey\Dirigent\Package\PackageMetadataResolver;
 use Composer\Semver\VersionParser;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Orm\EntityPaginatorInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Dto\PaginatorDto;
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -30,7 +31,6 @@ public function __construct(
         private readonly PackageRepository $packageRepository,
         private readonly PackageMetadataResolver $metadataResolver,
         private readonly MessageBusInterface $messenger,
-        private readonly AdminUrlGenerator $adminUrlGenerator,
     ) {
     }
 
@@ -46,9 +46,7 @@ public function list(Request $request): Response
             $queryBuilder->setParameter('query', "%{$query}%");
         }
 
-        $paginatorDto = new PaginatorDto(20, 3, 1, true, null);
-        $paginatorDto->setPageNumber($request->query->getInt('page', 1));
-        $paginator = (new PackagePaginator($this->adminUrlGenerator))->paginate($paginatorDto, $queryBuilder);
+        $paginator = $this->createPackagePaginator($request, $queryBuilder);
         $packages = $paginator->getResults();
 
         return $this->render('dashboard/packages/list.html.twig', [
@@ -293,4 +291,18 @@ public function delete(string $packageName): Response
 
         return $this->redirectToRoute('dashboard_packages');
     }
+
+    private function createPackagePaginator(Request $request, QueryBuilder $queryBuilder): EntityPaginatorInterface
+    {
+        $paginatorDto = new PaginatorDto(20, 3, 1, true, null);
+        $paginatorDto->setPageNumber($request->query->getInt('page', 1));
+
+        $paginator = new PackagePaginator(
+            $this->container->get('router'),
+            $request->attributes->get('_route'),
+            $request->attributes->get('_route_params'),
+        );
+
+        return $paginator->paginate($paginatorDto, $queryBuilder);
+    }
 }

src/EasyAdmin/PackagePaginator.php

@@ -4,10 +4,9 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Tools\Pagination\Paginator;
-use EasyCorp\Bundle\EasyAdminBundle\Config\Option\EA;
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Orm\EntityPaginatorInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Dto\PaginatorDto;
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class PackagePaginator implements EntityPaginatorInterface
 {
@@ -21,7 +20,9 @@ class PackagePaginator implements EntityPaginatorInterface
     private ?int $rangeLastResultNumber = null;
 
     public function __construct(
-        private readonly AdminUrlGeneratorInterface $adminUrlGenerator,
+        private readonly UrlGeneratorInterface $router,
+        private readonly string $routeName,
+        private readonly array $routeParameters = [],
     ) {
     }
 
@@ -53,7 +54,7 @@ public function paginate(PaginatorDto $paginatorDto, QueryBuilder $queryBuilder)
 
     public function generateUrlForPage(int $page): string
     {
-        return $this->adminUrlGenerator->set(EA::PAGE, $page)->generateUrl();
+        return $this->router->generate($this->routeName, [...$this->routeParameters, 'page' => $page]);
     }
 
     public function getCurrentPage(): int