From f5549bd26884543fbbc7ebc47eb6a6f7fc8eaf19 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 21 Jul 2017 10:04:25 +0200 Subject: [PATCH] moved routing configuration to routes/ instead of routing/ --- .../2.1/config/{routing => routes}/api_platform.yaml | 0 .../1.16/config/{routing => routes}/easy_admin.yaml | 0 symfony/framework-bundle/3.3/src/Kernel.php | 10 +++++----- .../3.3/config/{routing => routes}/dev/twig.yaml | 0 .../config/{routing => routes}/dev/web_profiler.yaml | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename api-platform/core/2.1/config/{routing => routes}/api_platform.yaml (100%) rename javiereguiluz/easyadmin-bundle/1.16/config/{routing => routes}/easy_admin.yaml (100%) rename symfony/twig-bundle/3.3/config/{routing => routes}/dev/twig.yaml (100%) rename symfony/web-profiler-bundle/3.3/config/{routing => routes}/dev/web_profiler.yaml (100%) diff --git a/api-platform/core/2.1/config/routing/api_platform.yaml b/api-platform/core/2.1/config/routes/api_platform.yaml similarity index 100% rename from api-platform/core/2.1/config/routing/api_platform.yaml rename to api-platform/core/2.1/config/routes/api_platform.yaml diff --git a/javiereguiluz/easyadmin-bundle/1.16/config/routing/easy_admin.yaml b/javiereguiluz/easyadmin-bundle/1.16/config/routes/easy_admin.yaml similarity index 100% rename from javiereguiluz/easyadmin-bundle/1.16/config/routing/easy_admin.yaml rename to javiereguiluz/easyadmin-bundle/1.16/config/routes/easy_admin.yaml diff --git a/symfony/framework-bundle/3.3/src/Kernel.php b/symfony/framework-bundle/3.3/src/Kernel.php index 1aa7fc4ba..6b64d98f2 100644 --- a/symfony/framework-bundle/3.3/src/Kernel.php +++ b/symfony/framework-bundle/3.3/src/Kernel.php @@ -50,12 +50,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa protected function configureRoutes(RouteCollectionBuilder $routes): void { $confDir = dirname(__DIR__).'/config'; - if (is_dir($confDir.'/routing/')) { - $routes->import($confDir.'/routing/*'.self::CONFIG_EXTS, '/', 'glob'); + if (is_dir($confDir.'/routes/')) { + $routes->import($confDir.'/routes/*'.self::CONFIG_EXTS, '/', 'glob'); } - if (is_dir($confDir.'/routing/'.$this->environment)) { - $routes->import($confDir.'/routing/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob'); + if (is_dir($confDir.'/routes/'.$this->environment)) { + $routes->import($confDir.'/routes/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob'); } - $routes->import($confDir.'/routing'.self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir.'/routes'.self::CONFIG_EXTS, '/', 'glob'); } } diff --git a/symfony/twig-bundle/3.3/config/routing/dev/twig.yaml b/symfony/twig-bundle/3.3/config/routes/dev/twig.yaml similarity index 100% rename from symfony/twig-bundle/3.3/config/routing/dev/twig.yaml rename to symfony/twig-bundle/3.3/config/routes/dev/twig.yaml diff --git a/symfony/web-profiler-bundle/3.3/config/routing/dev/web_profiler.yaml b/symfony/web-profiler-bundle/3.3/config/routes/dev/web_profiler.yaml similarity index 100% rename from symfony/web-profiler-bundle/3.3/config/routing/dev/web_profiler.yaml rename to symfony/web-profiler-bundle/3.3/config/routes/dev/web_profiler.yaml