Add ability to override routing with record_route

src/Canonical.php

@@ -9,10 +9,8 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouterInterface;
-use Tightenco\Collect\Support\Collection;
 
 class Canonical
 {
@@ -37,18 +35,14 @@ class Canonical
     /** @var string */
     private $path = null;
 
-    /** @var RouterInterface */
-    private $router;
-
     /** @var string */
     private $defaultLocale;
 
-    public function __construct(Config $config, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack, RouterInterface $router, string $defaultLocale)
+    public function __construct(Config $config, UrlGeneratorInterface $urlGenerator, RequestStack $requestStack, string $defaultLocale)
     {
         $this->config = $config;
         $this->urlGenerator = $urlGenerator;
         $this->request = $requestStack->getCurrentRequest();
-        $this->router = $router;
         $this->defaultLocale = $defaultLocale;
 
         $this->init();
@@ -150,13 +144,8 @@ public function getPath(): string
         if ($this->path === null) {
             $route = $this->request->attributes->get('_route');
             $params = $this->request->attributes->get('_route_params');
-            $canonicalRoute = $this->getCanonicalRoute($route, $params);
 
-            $this->path = $this->urlGenerator->generate(
-                $canonicalRoute,
-                $params,
-                UrlGeneratorInterface::ABSOLUTE_PATH
-            );
+            $this->path = $this->generateLink($route, $params, false);
         }
 
         return $this->path;
@@ -170,46 +159,32 @@ public function setPath(?string $route = null, array $params = []): void
             $route = $this->request->attributes->get('_route');
         }
 
-        $canonicalRoute = $this->getCanonicalRoute($route, $params);
-
         try {
-            $this->path = $this->urlGenerator->generate(
-                $canonicalRoute,
-                $params
-            );
+            $this->path = $this->generateLink($route, $params, false);
         } catch (InvalidParameterException | MissingMandatoryParametersException $e) {
             // Just use the current URL /shrug
-            $this->request->getUri();
+            $this->path = $this->request->getUri();
         }
     }
 
-    public function getCanonicalRoute(string $route, array &$params = []): string
+    public function generateLink(string $route, array $params, $canonical = false): ?string
     {
-        $routes = new Collection($this->router->getRouteCollection()->getIterator());
-        $currentController = $routes->get($route)->getDefault('_controller');
-
-        $routes = collect($routes->filter(function (Route $route) use ($currentController) {
-            return $route->getDefault('_controller') === $currentController;
-        })->keys());
-
-        // If only one route matched, return that.
-        if ($routes->count() === 1) {
-            return $routes->first();
+        if (isset($params['_locale']) && $params['_locale'] === $this->defaultLocale) {
+            unset($params['_locale']);
+            $routeWithoutLocale = str_replace('_locale', '', $route);
+
+            // If a route without the locale exists, use that. e.g. record_locale -> record
+            try {
+                $this->generateLink($routeWithoutLocale, $params);
+                $route = $routeWithoutLocale;
+            } catch (RouteNotFoundException $e) {
+            }
         }
 
-        // If no locale or locale is not default, get the first route which is named *_locale
-        if (array_key_exists('_locale', $params) && $params['_locale'] !== $this->defaultLocale) {
-            return $routes->filter(function (string $name) {
-                return fnmatch('*locale', $name);
-            })->first();
-        }
-
-        // Unset _locale so that it is not passed as query param to url.
-        unset($params['_locale']);
-
-        // Otherwise, get the first route that is not *_locale
-        return $routes->filter(function (string $name) {
-            return ! fnmatch('*locale', $name);
-        })->first();
+        return $this->urlGenerator->generate(
+            $route,
+            $params,
+            $canonical ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH
+        );
     }
 }

src/Configuration/Parser/ContentTypesParser.php

@@ -143,6 +143,9 @@ protected function parseContentType($key, array $contentType): ?ContentType
         if (! isset($contentType['listing_template'])) {
             $contentType['listing_template'] = $contentType['slug'] . '.twig';
         }
+        if (! isset($contentType['record_route'])) {
+            $contentType['record_route'] = isset($contentType['locales']) ? 'record_locale' : 'record';
+        }
 
         if ($contentType['singleton']) {
             $contentType['listing_records'] = 1;

src/Repository/ContentRepository.php

@@ -143,7 +143,7 @@ public function findOneBySlug(string $slug, ?ContentType $contentType = null): ?
             ->andWhere($where . ' = :slug')
             ->setParameter('slug', $slug);
 
-        if ($contentType) {
+        if ($contentType && $contentType->get('slug')) {
             $query->andWhere('content.contentType = :ct')
                 ->setParameter('ct', $contentType->get('slug'));
         }

src/Twig/ContentExtension.php

@@ -345,7 +345,7 @@ public function getLink(Content $content, bool $canonical = false, string $local
             'contentTypeSlug' => $content->getContentTypeSingularSlug(),
         ];
 
-        return $this->generateLink('record_locale', $params, $canonical);
+        return $this->generateLink($content->getDefinition()->get('record_route'), $params, $canonical);
     }
 
     public function getEditLink(Content $content): ?string
@@ -396,14 +396,8 @@ public function getStatusLink(Content $content, bool $absolute = false): ?string
 
     private function generateLink(string $route, array $params, $canonical = false): string
     {
-        $canonicalRoute = $this->canonical->getCanonicalRoute($route, $params);
-
         try {
-            $link = $this->urlGenerator->generate(
-                $canonicalRoute,
-                $params,
-                $canonical ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH
-            );
+            $link = $this->canonical->generateLink($route, $params, $canonical);
         } catch (InvalidParameterException $e) {
             $this->logger->notice('Could not create URL for route \'' . $route . '\'. Perhaps the ContentType was changed or removed. Try clearing the cache');
             $link = '';

tests/php/Configuration/Parser/ContentTypesParserTest.php

@@ -15,7 +15,7 @@ class ContentTypesParserTest extends ParserTestBase
 {
     public const NUMBER_OF_CONTENT_TYPES_IN_MINIMAL_FILE = 2;
 
-    public const AMOUNT_OF_ATTRIBUTES_IN_CONTENT_TYPE = 24;
+    public const AMOUNT_OF_ATTRIBUTES_IN_CONTENT_TYPE = 25;
 
     public const AMOUNT_OF_ATTRIBUTES_IN_FIELD = 24;