bug #6567 Fix an edge-case when using pretty URLs (javiereguiluz)

This PR was squashed before being merged into the 4.x branch.

Discussion
----------

Fix an edge-case when using pretty URLs

This is an alternative to #6553.

Fixes #6550, #6535, #6498.

`@alexislefebvre` thanks a lot for contributing that PR and also, thanks a lot for the failing test reproducer in #6559, which helped me a lot.

Commits
-------

eaa6a5b Fix an edge-case when using pretty URLs

Author: javiereguiluz

src/Router/AdminUrlGenerator.php

@@ -269,6 +269,12 @@ public function generateUrl(): string
         );
         ksort($routeParameters, \SORT_STRING);
 
+        // if no route parameters are passed, the route doesn't point to any CRUD controller
+        // action or to any custom action/route; consider it a link to the current dashboard
+        if ([] === $routeParameters) {
+            return $this->urlGenerator->generate($this->dashboardRoute);
+        }
+
         $context = $this->adminContextProvider->getContext();
         $usePrettyUrls = null !== $context && $context->usePrettyUrls();
         $urlType = null !== $context && false === $context->getAbsoluteUrls() ? UrlGeneratorInterface::ABSOLUTE_PATH : UrlGeneratorInterface::ABSOLUTE_URL;

tests/Controller/PrettyUrls/PrettyUrlsControllerTest.php

@@ -129,7 +129,7 @@ public function testDefaultMainMenuUsesPrettyUrls()
         $crawler = $client->request('GET', '/admin/pretty/urls/blog_post');
 
         $this->assertSame('/admin/pretty/urls', $crawler->filter('#header-logo a.logo')->attr('href'), 'The main Dashboard logo link points to the dashboard entry URL');
-        $this->assertSame('http://localhost/admin/pretty/urls/blog_post', $crawler->filter('li.menu-item a:contains("Dashboard")')->attr('href'), 'The Dashboard link inside the menu points to the first entity of the menu');
+        $this->assertSame('/admin/pretty/urls', $crawler->filter('li.menu-item a:contains("Dashboard")')->attr('href'), 'The Dashboard link inside the menu points to the dashboard entry URL (even if it later redirects to some other entity)');
         $this->assertSame('http://localhost/admin/pretty/urls/blog_post', $crawler->filter('li.menu-item a:contains("Blog Posts")')->attr('href'));
         $this->assertSame('http://localhost/admin/pretty/urls/category', $crawler->filter('li.menu-item a:contains("Categories")')->attr('href'));
     }
@@ -142,7 +142,7 @@ public function testCustomMainMenuUsesPrettyUrls()
         $crawler = $client->request('GET', '/second/dashboard/user-editor/custom/path-for-index');
 
         $this->assertSame('/second/dashboard', $crawler->filter('#header-logo a.logo')->attr('href'), 'The main Dashboard logo link points to the dashboard entry URL');
-        $this->assertSame('http://localhost/second/dashboard/user-editor/custom/path-for-index', $crawler->filter('li.menu-item a:contains("Dashboard")')->attr('href'), 'The Dashboard link inside the menu points to the first entity of the menu');
+        $this->assertSame('/second/dashboard', $crawler->filter('li.menu-item a:contains("Dashboard")')->attr('href'), 'The Dashboard link inside the menu points to the dashboard entry URL (even if it later redirects to some other entity)');
         $this->assertSame('http://localhost/second/dashboard/user-editor/custom/path-for-index', $crawler->filter('li.menu-item a:contains("Users")')->attr('href'));
     }
 
@@ -160,6 +160,19 @@ public function testDefaultActionsUsePrettyUrls()
         $this->assertMatchesRegularExpression('#http://localhost/admin/pretty/urls/blog_post/1/edit\?csrfToken=.*&fieldName=content#', $crawler->filter('td.field-boolean input[type="checkbox"]')->attr('data-toggle-url'));
     }
 
+    /**
+     * @dataProvider provideDefaultPageUrls
+     */
+    public function testDefaultPagesWithPrettyUrls(string $uri)
+    {
+        $client = static::createClient();
+        $client->followRedirects();
+
+        $client->request('GET', $uri);
+
+        $this->assertResponseIsSuccessful();
+    }
+
     public function testCustomActionsUsePrettyUrls()
     {
         $client = static::createClient();
@@ -198,4 +211,11 @@ public function testCustomSortLinksUsePrettyUrls()
         $this->assertSame('http://localhost/second/dashboard/user-editor/custom/path-for-index?page=1&sort%5Bname%5D=DESC', $crawler->filter('th.searchable a')->eq(1)->attr('href'));
         $this->assertSame('http://localhost/second/dashboard/user-editor/custom/path-for-index?page=1&sort%5Bemail%5D=DESC', $crawler->filter('th.searchable a')->eq(2)->attr('href'));
     }
+
+    public static function provideDefaultPageUrls(): iterable
+    {
+        yield 'Create' => ['/admin/pretty/urls/category/new'];
+        yield 'Read' => ['/admin/pretty/urls/category/1'];
+        yield 'Update' => ['/admin/pretty/urls/category/1/edit'];
+    }
 }

tests/Router/AdminUrlGeneratorTest.php

@@ -69,7 +69,7 @@ public function testUnsetAll()
 
         $adminUrlGenerator->set('foo1', 'bar1');
         $adminUrlGenerator->unsetAll();
-        $this->assertSame('http://localhost/admin', $adminUrlGenerator->generateUrl());
+        $this->assertSame('/admin', $adminUrlGenerator->generateUrl());
     }
 
     public function testUnsetAllExcept()