From b05764879bc630a68600007f1101fa882a29f05b Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Mon, 24 Jan 2022 11:08:21 +0100 Subject: [PATCH] Update recipe for symfony/framework-bundle --- src/Kernel.php | 27 --------------------------- symfony.lock | 16 ++++++++-------- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/Kernel.php b/src/Kernel.php index e63175f..ad0fb48 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -5,36 +5,9 @@ declare(strict_types=1); namespace App; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; class Kernel extends BaseKernel { use MicroKernelTrait; - - protected function configureContainer(ContainerConfigurator $container): void - { - $container->import('../config/{packages}/*.yaml'); - $container->import('../config/{packages}/'.$this->environment.'/*.yaml'); - - if (is_file(\dirname(__DIR__).'/config/services.yaml')) { - $container->import('../config/services.yaml'); - $container->import('../config/{services}_'.$this->environment.'.yaml'); - } elseif (is_file($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'); - - if (is_file(\dirname(__DIR__).'/config/routes.yaml')) { - $routes->import('../config/routes.yaml'); - } elseif (is_file($path = \dirname(__DIR__).'/config/routes.php')) { - (require $path)($routes->withPath($path), $this); - } - } } diff --git a/symfony.lock b/symfony.lock index 262d9dd..df0a22f 100644 --- a/symfony.lock +++ b/symfony.lock @@ -379,22 +379,22 @@ ] }, "symfony/framework-bundle": { - "version": "5.3", + "version": "5.4", "recipe": { "repo": "github.com/symfony/recipes", "branch": "master", - "version": "5.3", - "ref": "414ba00ad43fa71be42c7906a551f1831716b03c" + "version": "5.4", + "ref": "d4131812e20853626928e73d3effef44014944c0" }, "files": [ - "config/services.yaml", - "config/routes/framework.yaml", - "config/preload.php", "config/packages/cache.yaml", "config/packages/framework.yaml", + "config/preload.php", + "config/routes/framework.yaml", + "config/services.yaml", "public/index.php", - "src/Kernel.php", - "src/Controller/.gitignore" + "src/Controller/.gitignore", + "src/Kernel.php" ] }, "symfony/http-client": { -- GitLab