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

check for PHP files to exist before requiring them

Browse Source
This commit is contained in:
Christian Flothmann
2020-06-16 11:53:45 +02:00
parent 4442ff342c
commit 9effb0d5e9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
symfony/framework-bundle/5.1/src/Kernel.php
+4 -6
View File
@@ -16,11 +16,10 @@ class Kernel extends BaseKernel
$container->import('../config/{packages}/*.yaml'); $container->import('../config/{packages}/*.yaml');
$container->import('../config/{packages}/'.$this->environment.'/*.yaml'); $container->import('../config/{packages}/'.$this->environment.'/*.yaml');
if (file_exists(\dirname(__DIR__).'/config/services.yaml')) { if (is_file(\dirname(__DIR__).'/config/services.yaml')) {
$container->import('../config/{services}.yaml'); $container->import('../config/{services}.yaml');
$container->import('../config/{services}_'.$this->environment.'.yaml'); $container->import('../config/{services}_'.$this->environment.'.yaml');
} else { } elseif (is_file($path = \dirname(__DIR__).'/config/services.php')) {
$path = \dirname(__DIR__).'/config/services.php';
(require $path)($container->withPath($path), $this); (require $path)($container->withPath($path), $this);
} }
} }
@@ -30,10 +29,9 @@ class Kernel extends BaseKernel
$routes->import('../config/{routes}/'.$this->environment.'/*.yaml'); $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')) { if (is_file(\dirname(__DIR__).'/config/routes.yaml')) {
$routes->import('../config/{routes}.yaml'); $routes->import('../config/{routes}.yaml');
} else { } elseif (is_file($path = \dirname(__DIR__).'/config/routes.php')) {
$path = \dirname(__DIR__).'/config/routes.php';
(require $path)($routes->withPath($path), $this); (require $path)($routes->withPath($path), $this);
} }
} }