update 'dynamic' routing based on names of content types and taxonomies

config/routes.yaml

@@ -16,6 +16,14 @@ frontend:
   prefix: /
   type: annotation
 
+#
+# Special loader for dynamic routes based on names of content types and taxonomies.
+# Both for front-end and for the admin.
+#
+dynamic_routes:
+    resource: 'bolt.dynamic_route_loader::loadRoutes'
+    type: service
+
 # ------------------------------------------------------------------------------
 # Place your own routes here, that have a LOWER priority than the default routes.
 

config/services.yaml

@@ -170,3 +170,6 @@ services:
         decorates: 'api_platform.doctrine.orm.data_persister'
 
     Symfony\Component\DependencyInjection\ContainerInterface: '@service_container'
+
+    bolt.dynamic_route_loader:
+        class: Bolt\Routing\DynamicRouteLoader

src/Configuration/Config.php

@@ -82,7 +82,7 @@ private function getConfig(): Collection
                 $this->cache->delete(self::CACHE_KEY);
                 [$data] = $this->getCache();
 
-                // Clear the entire cache in order to re-generate %bolt.requirement.contenttypes%
+                // Clear the entire cache in order to re-generate routing table
                 $this->clearCacheController->clearcache($this->kernel);
             }
         }

src/Controller/Backend/ContentEditController.php

@@ -24,6 +24,7 @@
 use Bolt\Repository\MediaRepository;
 use Bolt\Repository\RelationRepository;
 use Bolt\Repository\TaxonomyRepository;
+use Bolt\Routing\DynamicRouteLoader;
 use Bolt\Security\ContentVoter;
 use Bolt\Utils\TranslationsManager;
 use Bolt\Validator\ContentValidatorInterface;
@@ -133,25 +134,15 @@ public function edit(Content $content): Response
     }
 
     /**
-     * @Route(
-     *     "/edit/{_locale}/{contentTypeSlug}/{slugOrId}",
-     *     name="bolt_edit_content_slug",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
-     *     methods={"GET"})
-     * @Route(
-     *     "/edit/{contentTypeSlug}/{slugOrId}",
-     *     name="bolt_edit_content_slug",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
-     *     methods={"GET"})
+     * @see DynamicRouteLoader for content type based routes to this method.
+     *
      * @Route(
      *     "/edit/{slugOrId}",
      *     name="bolt_edit_content_slug",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
      *     methods={"GET"})
      * @Route(
      *     "/edit/{_locale}/{slugOrId}",
      *     name="bolt_edit_content_slug",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
      *     methods={"GET"})
      */
     public function editFromSlug(?string $contentTypeSlug = null, $slugOrId): Response

src/Controller/Frontend/DetailController.php

@@ -7,6 +7,7 @@
 use Bolt\Configuration\Content\ContentType;
 use Bolt\Controller\TwigAwareController;
 use Bolt\Repository\ContentRepository;
+use Bolt\Routing\DynamicRouteLoader;
 use Bolt\Utils\ContentHelper;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -26,16 +27,7 @@ public function __construct(ContentRepository $contentRepository, ContentHelper
     }
 
     /**
-     * @Route(
-     *     "/{contentTypeSlug}/{slugOrId}",
-     *     name="record",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
-     *     methods={"GET|POST"})
-     * @Route(
-     *     "/{_locale}/{contentTypeSlug}/{slugOrId}",
-     *     name="record_locale",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%", "_locale": "%app_locales%"},
-     *     methods={"GET|POST"})
+     * @see DynamicRouteLoader for routes to this method.
      *
      * @param string|int $slugOrId
      */

src/Controller/Frontend/ListingController.php

@@ -9,6 +9,7 @@
 use Bolt\Controller\TwigAwareController;
 use Bolt\Entity\Content;
 use Bolt\Repository\ContentRepository;
+use Bolt\Routing\DynamicRouteLoader;
 use Bolt\Storage\Query;
 use Pagerfanta\Adapter\ArrayAdapter;
 use Pagerfanta\Pagerfanta;
@@ -28,16 +29,7 @@ public function __construct(Query $query)
     }
 
     /**
-     * @Route(
-     *     "/{contentTypeSlug}",
-     *     name="listing",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%"},
-     *     methods={"GET|POST"})
-     * @Route(
-     *     "/{_locale}/{contentTypeSlug}",
-     *     name="listing_locale",
-     *     requirements={"contentTypeSlug"="%bolt.requirement.contenttypes%", "_locale": "%app_locales%"},
-     *     methods={"GET|POST"})
+     * @see DynamicRouteLoader for routes to this method.
      */
     public function listing(ContentRepository $contentRepository, string $contentTypeSlug, ?string $_locale = null): Response
     {

src/Controller/Frontend/TaxonomyController.php

@@ -8,24 +8,14 @@
 use Bolt\Controller\TwigAwareController;
 use Bolt\Entity\Content;
 use Bolt\Repository\ContentRepository;
+use Bolt\Routing\DynamicRouteLoader;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 class TaxonomyController extends TwigAwareController implements FrontendZoneInterface
 {
     /**
-     * @Route(
-     *     "/{taxonomyslug}/{slug}",
-     *     name="taxonomy",
-     *     requirements={"taxonomyslug"="%bolt.requirement.taxonomies%"},
-     *     methods={"GET|POST"}
-     * )
-     * @Route(
-     *     "/{_locale}/{taxonomyslug}/{slug}",
-     *     name="taxonomy_locale",
-     *     requirements={"taxonomyslug"="%bolt.requirement.taxonomies%", "_locale": "%app_locales%"},
-     *     methods={"GET|POST"}
-     * )
+     * @see DynamicRouteLoader for routes to this method.
      */
     public function listing(ContentRepository $contentRepository, string $taxonomyslug, string $slug): Response
     {

src/Kernel.php

@@ -4,8 +4,6 @@
 
 namespace Bolt;
 
-use Bolt\Configuration\Parser\ContentTypesParser;
-use Bolt\Configuration\Parser\TaxonomyParser;
 use Bolt\Extension\ExtensionCompilerPass;
 use Bolt\Extension\ExtensionInterface;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -17,7 +15,6 @@
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Support\Collection;
 
 class Kernel extends BaseKernel
 {
@@ -74,8 +71,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
 
         $this->setBoltParameters($container, $confDir);
-        $this->setContentTypeRequirements($container);
-        $this->setTaxonomyRequirements($container);
+        $container->setParameter('bolt.requirement.contenttypes', "Dummy value so Checks.php in bobdenotter/configuration-notices doesn't break");
     }
 
     protected function configureRoutes(RoutingConfigurator $routes): void
@@ -121,44 +117,6 @@ private function flattenKeys(array $array, string $prefix = ''): array
         return $result;
     }
 
-    /**
-     * Set the ContentType requirements that are used in Routing.
-     * Note: this functionality is partially duplicated in \Bolt\Configuration\Config.
-     *
-     * @throws \Exception
-     */
-    private function setContentTypeRequirements(ContainerBuilder $container): void
-    {
-        /** @var string $defaultLocale */
-        $defaultLocale = $container->getParameter('locale');
-        $ContentTypesParser = new ContentTypesParser($this->getProjectDir(), new Collection(), $defaultLocale);
-        $contentTypes = $ContentTypesParser->parse();
-
-        $pluralslugs = $contentTypes->pluck('slug')->implode('|');
-        $slugs = $contentTypes->pluck('slug')->concat($contentTypes->pluck('singular_slug'))->unique()->implode('|');
-
-        $container->setParameter('bolt.requirement.pluralcontenttypes', $pluralslugs);
-        $container->setParameter('bolt.requirement.contenttypes', $slugs);
-    }
-
-    /**
-     * Set the Taxonomy requirements that are used in Routing.
-     * Note: this functionality is partially duplicated in \Bolt\Configuration\Config.
-     *
-     * @throws \Exception
-     */
-    private function setTaxonomyRequirements(ContainerBuilder $container): void
-    {
-        $taxonomyParser = new TaxonomyParser($this->getProjectDir());
-        $taxonomies = $taxonomyParser->parse();
-
-        $pluralslugs = $taxonomies->pluck('slug')->implode('|');
-        $slugs = $taxonomies->pluck('slug')->concat($taxonomies->pluck('singular_slug'))->unique()->implode('|');
-
-        $container->setParameter('bolt.requirement.pluraltaxonomies', $pluralslugs);
-        $container->setParameter('bolt.requirement.taxonomies', $slugs);
-    }
-
     /**
      * Return the public folder of this project. This implementation locates the public folder
      * for this project by checking for the following candidates in the project dir: 'public',