From 2bcf47409f1f552f9e3f063f8a1c52ef0ab876ca Mon Sep 17 00:00:00 2001 From: Michiel Kodde Date: Wed, 10 Jan 2024 15:33:58 +0100 Subject: [PATCH] Simplify the Kernel By leaning on the MicroKernelTrait --- ...surfnet_stepup.yml => surfnet_stepup.yaml} | 0 src/Kernel.php | 38 ------------------- 2 files changed, 38 deletions(-) rename config/packages/{surfnet_stepup.yml => surfnet_stepup.yaml} (100%) diff --git a/config/packages/surfnet_stepup.yml b/config/packages/surfnet_stepup.yaml similarity index 100% rename from config/packages/surfnet_stepup.yml rename to config/packages/surfnet_stepup.yaml diff --git a/src/Kernel.php b/src/Kernel.php index 006a522d..2344583a 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -18,52 +18,14 @@ namespace App; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; -use Symfony\Component\Routing\RouteCollectionBuilder; class Kernel extends BaseKernel { use MicroKernelTrait; - private const CONFIG_EXTS = '.{php,xml,yaml,yml}'; - - public function registerBundles(): iterable - { - $contents = require $this->getProjectDir().'/config/bundles.php'; - foreach ($contents as $class => $envs) { - if ($envs[$this->environment] ?? $envs['all'] ?? false) { - yield new $class(); - } - } - } - public function getProjectDir(): string { return \dirname(__DIR__); } - - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void - { - $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php')); - $container->setParameter('container.dumper.inline_class_loader', true); - $confDir = $this->getProjectDir().'/config'; - - $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); - } - - protected function configureRoutes(RoutingConfigurator $routes): void - { - $confDir = $this->getProjectDir().'/config'; - - $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'); - } }