Merge pull request #785

This commit is contained in:
symfony-flex-server[bot]
2020-06-12 16:02:09 +00:00
committed by GitHub
+15 -3
View File
@@ -15,14 +15,26 @@ class Kernel extends BaseKernel
{
$container->import('../config/{packages}/*.yaml');
$container->import('../config/{packages}/'.$this->environment.'/*.yaml');
$container->import('../config/{services}.yaml');
$container->import('../config/{services}_'.$this->environment.'.yaml');
if (file_exists(\dirname(__DIR__).'/config/services.yaml')) {
$container->import('../config/{services}.yaml');
$container->import('../config/{services}_'.$this->environment.'.yaml');
} else {
$path = \dirname(__DIR__).'/config/services.php';
(require $path)($container->withPath($path), $this);
}
}
protected function configureRoutes(RoutingConfigurator $routes): void
{
$routes->import('../config/{routes}/'.$this->environment.'/*.yaml');
$routes->import('../config/{routes}/*.yaml');
$routes->import('../config/{routes}.yaml');
if (file_exists(\dirname(__DIR__).'/config/routes.yaml')) {
$routes->import('../config/{routes}.yaml');
} else {
$path = \dirname(__DIR__).'/config/routes.php';
(require $path)($routes->withPath($path), $this);
}
}
}