Merge branch '4.x' into 5.x

* 4.x:
  Fix batch actions with ugly URLs
  -
  Improve findRoute() method in admin route generator

Author: javiereguiluz

src/Router/AdminRouteGenerator.php

@@ -94,11 +94,16 @@ public function usesPrettyUrls(): bool
         return $this->applicationUsesPrettyUrls ??= $this->filesystem->exists(sprintf('%s/%s', $this->buildDir, AdminRouteLoader::PRETTY_URLS_CONTEXT_FILE_NAME));
     }
 
-    public function findRouteName(string $dashboardFqcn, string $crudControllerFqcn, string $actionName): ?string
+    public function findRouteName(?string $dashboardFqcn = null, ?string $crudControllerFqcn = null, ?string $actionName = null): ?string
     {
         $adminRoutes = $this->cache->getItem(self::CACHE_KEY_FQCN_TO_ROUTE)->get();
 
-        return $adminRoutes[$dashboardFqcn][$crudControllerFqcn][$actionName] ?? null;
+        if (null === $dashboardFqcn) {
+            $dashboardControllers = iterator_to_array($this->dashboardControllers);
+            $dashboardFqcn = $dashboardControllers[array_key_first($dashboardControllers)]::class;
+        }
+
+        return $adminRoutes[$dashboardFqcn][$crudControllerFqcn ?? ''][$actionName ?? ''] ?? null;
     }
 
     /**

tests/Router/AdminRouteGeneratorTest.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace EasyCorp\Bundle\EasyAdminBundle\Tests\Router;
+
+use EasyCorp\Bundle\EasyAdminBundle\Router\AdminRouteGenerator;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\PrettyUrlsTestApplication\Controller\BlogPostCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\PrettyUrlsTestApplication\Controller\CategoryCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\PrettyUrlsTestApplication\Controller\DashboardController;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\PrettyUrlsTestApplication\Controller\SecondDashboardController;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\Filesystem\Filesystem;
+
+class AdminRouteGeneratorTest extends WebTestCase
+{
+    /**
+     * @dataProvider provideFindRouteData
+     */
+    public function testFindRoute(?string $dashboardControllerFqcn, ?string $crudControllerFqcn, ?string $action, ?string $expectedRouteName)
+    {
+        $client = static::createClient();
+        $cacheMock = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
+        $cacheMock->method('getItem')->willReturnCallback(function ($key) {
+            $item = new CacheItem();
+            $item->expiresAfter(3600);
+
+            if (AdminRouteGenerator::CACHE_KEY_FQCN_TO_ROUTE !== $key) {
+                return $item;
+            }
+
+            $item->set([
+                DashboardController::class => [
+                    '' => [
+                        '' => 'admin',
+                    ],
+                    BlogPostCrudController::class => [
+                        'index' => 'admin_post_index',
+                        'new' => 'admin_post_new',
+                        'edit' => 'admin_post_edit',
+                        'detail' => 'admin_post_detail',
+                    ],
+                ],
+                SecondDashboardController::class => [
+                    '' => [
+                        '' => 'second_admin',
+                    ],
+                ],
+            ]);
+
+            return $item;
+        });
+
+        $dashboardControllers = new RewindableGenerator(function () {
+            yield DashboardController::class => new DashboardController();
+            yield SecondDashboardController::class => new SecondDashboardController();
+        }, 2);
+
+        $adminRouteGenerator = new AdminRouteGenerator(
+            $dashboardControllers,
+            [],
+            $cacheMock,
+            new Filesystem(),
+            $client->getKernel()->getBuildDir(),
+        );
+
+        $routeName = $adminRouteGenerator->findRouteName($dashboardControllerFqcn, $crudControllerFqcn, $action);
+        $this->assertSame($expectedRouteName, $routeName);
+    }
+
+    public function provideFindRouteData(): iterable
+    {
+        yield [null, null, null, 'admin'];
+        yield [DashboardController::class, null, null, 'admin'];
+        yield [DashboardController::class, BlogPostCrudController::class, null, null];
+        yield [DashboardController::class, BlogPostCrudController::class, 'index', 'admin_post_index'];
+        yield [DashboardController::class, BlogPostCrudController::class, 'detail', 'admin_post_detail'];
+        yield [DashboardController::class, CategoryCrudController::class, null, null];
+        yield [DashboardController::class, CategoryCrudController::class, 'index', null];
+        yield [DashboardController::class, CategoryCrudController::class, 'detail', null];
+        yield [SecondDashboardController::class, null, null, 'second_admin'];
+        yield [SecondDashboardController::class, BlogPostCrudController::class, null, null];
+        yield [SecondDashboardController::class, BlogPostCrudController::class, 'index', null];
+        yield [SecondDashboardController::class, BlogPostCrudController::class, 'detail', null];
+    }
+}