Merge pull request #678

symfony-flex-server[bot] · web-flow · commit bc7ddc259724 · 2019-11-17T11:42:04.000Z
diff --git a/symfony/framework-bundle/3.3/src/Kernel.php b/symfony/framework-bundle/3.3/src/Kernel.php
@@ -45,7 +45,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $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 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
     {
         $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
@@ -37,7 +37,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $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 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void
     {
         $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');
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa`
`45`	`45`	`$confDir = $this->getProjectDir().'/config';`
`46`	`46`
`47`	`47`	`$loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');`
`48`		`- $loader->load($confDir.'/{packages}/'.$this->environment.'/*/'.self::CONFIG_EXTS, 'glob');`
	`48`	`+ $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob');`
`49`	`49`	`$loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');`
`50`	`50`	`$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');`
`51`	`51`	`}`
`@@ -54,7 +54,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes)`
`54`	`54`	`{`
`55`	`55`	`$confDir = $this->getProjectDir().'/config';`
`56`	`56`
`57`		`- $routes->import($confDir.'/{routes}/'.$this->environment.'/*/'.self::CONFIG_EXTS, '/', 'glob');`
	`57`	`+ $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob');`
`58`	`58`	`$routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`59`	`59`	`$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa`
`37`	`37`	`$confDir = $this->getProjectDir().'/config';`
`38`	`38`
`39`	`39`	`$loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');`
`40`		`- $loader->load($confDir.'/{packages}/'.$this->environment.'/*/'.self::CONFIG_EXTS, 'glob');`
	`40`	`+ $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob');`
`41`	`41`	`$loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');`
`42`	`42`	`$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');`
`43`	`43`	`}`
`@@ -46,7 +46,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void`
`46`	`46`	`{`
`47`	`47`	`$confDir = $this->getProjectDir().'/config';`
`48`	`48`
`49`		`- $routes->import($confDir.'/{routes}/'.$this->environment.'/*/'.self::CONFIG_EXTS, '/', 'glob');`
	`49`	`+ $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob');`
`50`	`50`	`$routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`51`	`51`	`$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');`
`52`	`52`	`}`