From 43a00406b59a2d55db927a1b8a180a3cc00a6b52 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Nahan <814683+macintoshplus@users.noreply.github.com>
Date: Thu, 6 Mar 2025 15:20:03 +0100
Subject: [PATCH 1/2] :arrow_up: Require Symfony 5.4 and remode web server
 bundle

---
 composer.json      | 67 ++++++++++++++++++++++------------------------
 config/bundles.php |  1 -
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/composer.json b/composer.json
index 9d5e1f8f9..00d22da66 100644
--- a/composer.json
+++ b/composer.json
@@ -42,40 +42,39 @@
         "sensio/framework-extra-bundle": "^6.2",
         "siriusphp/upload": "^3.0.1",
         "squirrelphp/twig-php-syntax": "^1.6",
-        "symfony/asset": "^5.3",
-        "symfony/cache": "^5.3",
-        "symfony/console": "^5.3",
-        "symfony/debug-bundle": "^5.3",
-        "symfony/dependency-injection": "^5.3",
-        "symfony/dotenv": "^5.3",
-        "symfony/error-handler": "^5.3",
-        "symfony/event-dispatcher": "^5.3",
-        "symfony/expression-language": "^5.3",
+        "symfony/asset": "^5.4",
+        "symfony/cache": "^5.4",
+        "symfony/console": "^5.4",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dependency-injection": "^5.4",
+        "symfony/dotenv": "^5.4",
+        "symfony/error-handler": "^5.4",
+        "symfony/event-dispatcher": "^5.4",
+        "symfony/expression-language": "^5.4",
         "symfony/flex": "^1.17 || ^2.0",
-        "symfony/form": "^5.3",
-        "symfony/framework-bundle": "^5.3",
-        "symfony/http-client": "^5.3",
-        "symfony/mailer": "^5.3",
-        "symfony/mime": "^5.3",
-        "symfony/monolog-bridge": "^5.3",
+        "symfony/form": "^5.4",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/http-client": "^5.4",
+        "symfony/mailer": "^5.4",
+        "symfony/mime": "^5.4",
+        "symfony/monolog-bridge": "^5.4",
         "symfony/monolog-bundle": "^3.7",
-        "symfony/password-hasher": "^5.3",
+        "symfony/password-hasher": "^5.4",
         "symfony/polyfill-php72": "^1.23",
-        "symfony/security-bundle": "^5.3",
-        "symfony/security-csrf": "^5.3",
-        "symfony/serializer": "^5.3",
-        "symfony/stopwatch": "^5.3",
-        "symfony/string": "^5.3",
-        "symfony/translation": "^5.3",
-        "symfony/twig-bridge": "^5.3",
-        "symfony/twig-bundle": "^5.3",
-        "symfony/validator": "^5.3",
-        "symfony/var-dumper": "^5.3",
-        "symfony/var-exporter": "^5.3",
-        "symfony/web-profiler-bundle": "^5.3",
-        "symfony/web-server-bundle": "^4.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/security-csrf": "^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/stopwatch": "^5.4",
+        "symfony/string": "^5.4",
+        "symfony/translation": "^5.4",
+        "symfony/twig-bridge": "^5.4",
+        "symfony/twig-bundle": "^5.5",
+        "symfony/validator": "^5.4",
+        "symfony/var-dumper": "^5.4",
+        "symfony/var-exporter": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4",
         "symfony/webpack-encore-bundle": "^1.12",
-        "symfony/yaml": "^5.3",
+        "symfony/yaml": "^5.4",
         "symfonycasts/reset-password-bundle": "^1.9",
         "tightenco/collect": "^v8.34",
         "twig/extra-bundle": "^3.3",
@@ -88,8 +87,6 @@
         "xemlock/htmlpurifier-html5": "^0.1.11"
     },
     "conflict": {
-        "symfony/dependency-injection": "5.3.7",
-        "symfony/security-http": "v5.3.0 || v5.3.1",
         "doctrine/dbal": "^3.0",
         "cocur/slugify": "4.5.0"
     },
@@ -114,8 +111,8 @@
         "phpstan/phpstan-symfony": "^1.0.1",
         "phpunit/phpunit": "^8.5",
         "se/selenium-server-standalone": "^3.141",
-        "symfony/browser-kit": "^5.3",
-        "symfony/css-selector": "^5.3",
+        "symfony/browser-kit": "^5.4",
+        "symfony/css-selector": "^5.4",
         "symplify/easy-coding-standard": "^10.0"
     },
     "config": {
@@ -134,7 +131,7 @@
         "public-dir": "public",
         "symfony": {
             "allow-contrib": true,
-            "require": "^5.2"
+            "require": "^5.4"
         }
     },
     "autoload": {
diff --git a/config/bundles.php b/config/bundles.php
index a7b0da2d3..8194a8122 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -18,7 +18,6 @@
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'local' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
     Translation\Bundle\TranslationBundle::class => ['all' => true],

From 1355925ee19f40a975383414236a2fbfd3a02f08 Mon Sep 17 00:00:00 2001
From: Bob van de Vijver <bobvandevijver@users.noreply.github.com>
Date: Thu, 6 Mar 2025 22:40:32 +0100
Subject: [PATCH 2/2] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00d22da66..f468d137f 100644
--- a/composer.json
+++ b/composer.json
@@ -68,7 +68,7 @@
         "symfony/string": "^5.4",
         "symfony/translation": "^5.4",
         "symfony/twig-bridge": "^5.4",
-        "symfony/twig-bundle": "^5.5",
+        "symfony/twig-bundle": "^5.4",
         "symfony/validator": "^5.4",
         "symfony/var-dumper": "^5.4",
         "symfony/var-exporter": "^5.4",