From aedd86b70d9cfee2968593b0f603fe9dc78d2ec5 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 15 Nov 2019 16:42:35 +0100 Subject: [PATCH] Dont look recursively into per-env folders --- symfony/framework-bundle/3.3/src/Kernel.php | 4 ++-- symfony/framework-bundle/4.2/src/Kernel.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/symfony/framework-bundle/3.3/src/Kernel.php b/symfony/framework-bundle/3.3/src/Kernel.php index 81837398..68b7a561 100644 --- a/symfony/framework-bundle/3.3/src/Kernel.php +++ b/symfony/framework-bundle/3.3/src/Kernel.php @@ -45,7 +45,7 @@ class Kernel extends BaseKernel $confDir = $this->getProjectDir().'/config'; $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob'); + $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob'); $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); } @@ -54,7 +54,7 @@ class Kernel extends BaseKernel { $confDir = $this->getProjectDir().'/config'; - $routes->import($confDir.'/{routes}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob'); $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob'); $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob'); } diff --git a/symfony/framework-bundle/4.2/src/Kernel.php b/symfony/framework-bundle/4.2/src/Kernel.php index 785b0bef..4d7673ce 100644 --- a/symfony/framework-bundle/4.2/src/Kernel.php +++ b/symfony/framework-bundle/4.2/src/Kernel.php @@ -37,7 +37,7 @@ class Kernel extends BaseKernel $confDir = $this->getProjectDir().'/config'; $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob'); + $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob'); $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); } @@ -46,7 +46,7 @@ class Kernel extends BaseKernel { $confDir = $this->getProjectDir().'/config'; - $routes->import($confDir.'/{routes}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob'); + $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob'); $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob'); $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob'); }