decole/symfony-flex-recipes
1
0
Fork 0
mirror of https://github.com/symfony/recipes.git synced 2026-09-12 23:56:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #721"

Browse Source 
This reverts commit ed25f50bef, reversing
changes made to 9880918fbf.
This commit is contained in:
Nicolas Grekas
2020-04-03 15:45:57 +02:00
parent 937bca6a54
commit b341fbe67c
6 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
symfony/framework-bundle/5.1/src/Kernel.php
+3 -15
View File
@@ -15,26 +15,14 @@ class Kernel extends BaseKernel
{
$container->import('../config/{packages}/*.yaml');
$container->import('../config/{packages}/'.$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);
}
$container->import('../config/{services}.yaml');
$container->import('../config/{services}_'.$this->environment.'.yaml');
}
protected function configureRoutes(RoutingConfigurator $routes): void
{
$routes->import('../config/{routes}/'.$this->environment.'/*.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);
}
$routes->import('../config/{routes}.yaml');
}
}