[FrameworkBundle] allow container/routing configurators to vary by env

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1011,7 +1011,10 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
             $container->register('routing.loader.annotation', AnnotatedRouteControllerLoader::class)
                 ->setPublic(false)
                 ->addTag('routing.loader', ['priority' => -10])
-                ->addArgument(new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+                ->setArguments([
+                    new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '%kernel.environment%',
+                ]);
 
             $container->register('routing.loader.annotation.directory', AnnotationDirectoryLoader::class)
                 ->setPublic(false)

Kernel/MicroKernelTrait.php

@@ -152,7 +152,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             };
 
             try {
-                $this->configureContainer(new ContainerConfigurator($container, $kernelLoader, $instanceof, $file, $file), $loader);
+                $this->configureContainer(new ContainerConfigurator($container, $kernelLoader, $instanceof, $file, $file, $this->getEnvironment()), $loader);
             } finally {
                 $instanceof = [];
                 $kernelLoader->registerAliasesForSinglyImplementedInterfaces();
@@ -193,7 +193,7 @@ public function loadRoutes(LoaderInterface $loader)
             return $routes->build();
         }
 
-        $this->configureRoutes(new RoutingConfigurator($collection, $kernelLoader, $file, $file));
+        $this->configureRoutes(new RoutingConfigurator($collection, $kernelLoader, $file, $file, $this->getEnvironment()));
 
         foreach ($collection as $route) {
             $controller = $route->getDefault('_controller');

Resources/config/routing.php

@@ -49,36 +49,42 @@
         ->set('routing.loader.xml', XmlFileLoader::class)
             ->args([
                 service('file_locator'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 
         ->set('routing.loader.yml', YamlFileLoader::class)
             ->args([
                 service('file_locator'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 
         ->set('routing.loader.php', PhpFileLoader::class)
             ->args([
                 service('file_locator'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 
         ->set('routing.loader.glob', GlobFileLoader::class)
             ->args([
                 service('file_locator'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 
         ->set('routing.loader.directory', DirectoryLoader::class)
             ->args([
                 service('file_locator'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 
         ->set('routing.loader.container', ContainerLoader::class)
             ->args([
                 tagged_locator('routing.route_loader'),
+                '%kernel.environment%',
             ])
             ->tag('routing.loader')
 

composer.json

@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "ext-xml": "*",
         "symfony/cache": "^5.2",
-        "symfony/config": "^5.0",
+        "symfony/config": "^5.3",
         "symfony/dependency-injection": "^5.3",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/event-dispatcher": "^5.1",
@@ -30,7 +30,7 @@
         "symfony/polyfill-php80": "^1.15",
         "symfony/filesystem": "^4.4|^5.0",
         "symfony/finder": "^4.4|^5.0",
-        "symfony/routing": "^5.2"
+        "symfony/routing": "^5.3"
     },
     "require-dev": {
         "doctrine/annotations": "^1.10.4",