Skip to content

Commit cf92bef

Browse files
committed
minor #787 Updated the Kernel.php code to the latest Symfony recipe (javiereguiluz)
This PR was squashed before being merged into the master branch (closes #787). Discussion ---------- Updated the Kernel.php code to the latest Symfony recipe Updated src/Kernel.php according to the most recent version of https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/3.3/src/Kernel.php Commits ------- ddde8ef Updated the Kernel.php code to the latest Symfony recipe
2 parents 693562c + ddde8ef commit cf92bef

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/Kernel.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
1515
use Symfony\Component\Config\Loader\LoaderInterface;
16+
use Symfony\Component\Config\Resource\FileResource;
1617
use Symfony\Component\DependencyInjection\ContainerBuilder;
1718
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
1819
use Symfony\Component\Routing\RouteCollectionBuilder;
@@ -45,25 +46,22 @@ public function registerBundles()
4546

4647
protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
4748
{
49+
$container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
4850
$container->setParameter('container.dumper.inline_class_loader', true);
4951
$confDir = $this->getProjectDir().'/config';
50-
$loader->load($confDir.'/packages/*'.self::CONFIG_EXTS, 'glob');
51-
if (is_dir($confDir.'/packages/'.$this->environment)) {
52-
$loader->load($confDir.'/packages/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob');
53-
}
54-
$loader->load($confDir.'/services'.self::CONFIG_EXTS, 'glob');
55-
$loader->load($confDir.'/services_'.$this->environment.self::CONFIG_EXTS, 'glob');
52+
53+
$loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
54+
$loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob');
55+
$loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
56+
$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
5657
}
5758

5859
protected function configureRoutes(RouteCollectionBuilder $routes)
5960
{
6061
$confDir = $this->getProjectDir().'/config';
61-
if (is_dir($confDir.'/routes/')) {
62-
$routes->import($confDir.'/routes/*'.self::CONFIG_EXTS, '/', 'glob');
63-
}
64-
if (is_dir($confDir.'/routes/'.$this->environment)) {
65-
$routes->import($confDir.'/routes/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob');
66-
}
67-
$routes->import($confDir.'/routes'.self::CONFIG_EXTS, '/', 'glob');
62+
63+
$routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
64+
$routes->import($confDir.'/{routes}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob');
65+
$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
6866
}
6967
}

0 commit comments

Comments
 (0)