Merge pull request #560

symfony-flex-server[bot] · web-flow · commit 987cf6ec3310 · 2019-04-01T13:14:23.000Z
diff --git a/symfony/framework-bundle/3.3/src/Kernel.php b/symfony/framework-bundle/3.3/src/Kernel.php
@@ -54,8 +54,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
`@@ -54,8 +54,8 @@ protected function configureRoutes(RouteCollectionBuilder $routes)`
`54`	`54`	`{`
`55`	`55`	`$confDir = $this->getProjectDir().'/config';`
`56`	`56`
`57`		`- $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`58`	`57`	`$routes->import($confDir.'/{routes}/'.$this->environment.'/*/'.self::CONFIG_EXTS, '/', 'glob');`
	`58`	`+ $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`59`	`59`	`$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');`
`60`	`60`	`}`
`61`	`61`	`}`