bug #6617 Some fixes related to pretty URLs (javiereguiluz)

This PR was merged into the 4.x branch.

Discussion
----------

Some fixes related to pretty URLs

Commits
-------

b98e5a6 Some fixes related to pretty URLs

src/EventListener/AdminRouterSubscriber.php

@@ -138,8 +138,8 @@ public function onKernelController(ControllerEvent $event): void
 
         // if the request is related to a CRUD controller, change the controller to be executed
         if (null !== $crudControllerInstance = $this->getCrudControllerInstance($request)) {
-            $symfonyControllerFqcnCallable = [$crudControllerInstance, $request->query->get(EA::CRUD_ACTION)];
-            $symfonyControllerStringCallable = [$crudControllerInstance::class, $request->query->get(EA::CRUD_ACTION)];
+            $symfonyControllerFqcnCallable = [$crudControllerInstance, $request->attributes->get(EA::CRUD_ACTION) ?? $request->query->get(EA::CRUD_ACTION)];
+            $symfonyControllerStringCallable = [$crudControllerInstance::class, $request->attributes->get(EA::CRUD_ACTION) ?? $request->query->get(EA::CRUD_ACTION)];
 
             // this makes Symfony believe that another controller is being executed
             // (e.g. this is needed for the autowiring of controller action arguments)
@@ -207,9 +207,9 @@ private function getDashboardControllerInstance(string $dashboardControllerFqcn,
 
     private function getCrudControllerInstance(Request $request): ?CrudControllerInterface
     {
-        $crudControllerFqcn = $request->query->get(EA::CRUD_CONTROLLER_FQCN);
-
-        $crudAction = $request->query->get(EA::CRUD_ACTION);
+        // when using pretty URLs, the data is in the request attributes instead of the query string
+        $crudControllerFqcn = $request->attributes->get(EA::CRUD_CONTROLLER_FQCN) ?? $request->query->get(EA::CRUD_CONTROLLER_FQCN);
+        $crudAction = $request->attributes->get(EA::CRUD_ACTION) ?? $request->query->get(EA::CRUD_ACTION);
 
         return $this->controllerFactory->getCrudControllerInstance($crudControllerFqcn, $crudAction, $request);
     }