Merge pull request #537

symfony-flex-server[bot] · web-flow · commit e07c179080fc · 2019-02-25T16:19:01.000Z
diff --git a/symfony/framework-bundle/4.2/src/Kernel.php b/symfony/framework-bundle/4.2/src/Kernel.php
@@ -41,8 +41,8 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
     {
         $confDir = $this->getProjectDir().'/config';
 
-        $routes->import($confDir.'/{routes}/*'.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
`@@ -41,8 +41,8 @@ protected function configureRoutes(RouteCollectionBuilder $routes)`
`41`	`41`	`{`
`42`	`42`	`$confDir = $this->getProjectDir().'/config';`
`43`	`43`
`44`		`- $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`45`	`44`	`$routes->import($confDir.'/{routes}/'.$this->environment.'/*/'.self::CONFIG_EXTS, '/', 'glob');`
	`45`	`+ $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`46`	`46`	`$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');`
`47`	`47`	`}`
`48`	`48`	`}`