Merge pull request #1556 from tarlepp/chore(recipes)/recipe-update

Chore(recipes) - Updated recipes
tarlepp · Dec 17, 2021 · 6950016 · 6950016
2 parents 51d49f9 + 9424d30
commit 6950016
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 39 deletions.
diff --git a/.env b/.env
@@ -20,7 +20,7 @@
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
-APP_SECRET=5fa00cef82a42f8f93d66a31aa79fdfc
+APP_SECRET=52db5c9d768c5c38637802ea641e3e4b
 ###< symfony/framework-bundle ###
 
 ###> symfony-flex-backend ###

diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -15,6 +15,9 @@ framework:
     serializer:
         enable_annotations: true
 
+    php_errors:
+        log: true
+
     # Enables session support. Note that the session will ONLY be started if you read or write from it.
     # Remove or comment this section to explicitly disable session support.
     #session:
@@ -25,9 +28,6 @@ framework:
     #esi: true
     #fragments: true
 
-    php_errors:
-        log: true
-
 when@test:
     framework:
         test: true

diff --git a/src/Kernel.php b/src/Kernel.php
@@ -9,11 +9,7 @@
 use App\Compiler\StopwatchCompilerPass;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-use function dirname;
-use function is_file;
 
 /**
  * Class Kernel
@@ -32,29 +28,4 @@ protected function build(ContainerBuilder $container): void
             $container->addCompilerPass(new StopwatchCompilerPass());
         }
     }
-
-    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');
-
-            return;
-        }
-
-        $container->import('../config/{services}.php');
-    }
-
-    protected function configureRoutes(RoutingConfigurator $routes): void
-    {
-        $routes->import('../config/{routes}/' . $this->environment . '/*.yaml');
-        $routes->import('../config/{routes}/*.yaml');
-
-        is_file(dirname(__DIR__) . '/config/routes.yaml')
-            ? $routes->import('../config/routes.yaml')
-            : $routes->import('../config/{routes}.php');
-    }
 }
diff --git a/symfony.lock b/symfony.lock
@@ -323,12 +323,12 @@
         "version": "v4.4.3"
     },
     "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/packages/cache.yaml",
@@ -512,12 +512,12 @@
         "version": "v4.4.3"
     },
     "symfony/twig-bundle": {
-        "version": "5.3",
+        "version": "5.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
-            "version": "5.3",
-            "ref": "3dd530739a4284e3272274c128dbb7a8140a66f1"
+            "version": "5.4",
+            "ref": "bffbb8f1a849736e64006735afae730cb428b6ff"
         },
         "files": [
             "config/packages/twig.yaml",