resolve conflict

.env.dev

@@ -1,4 +0,0 @@
-
-###> symfony/framework-bundle ###
-APP_SECRET=bba5a2c490c3f92030618ecb97b5138e
-###< symfony/framework-bundle ###

.gitignore

@@ -24,3 +24,9 @@
 ###> IntelliJ IDEA ###
 .idea/
 *.iml
+###< IntelliJ IDEA ###
+
+###>jwt keys###
+/config/jwt/private.key
+/config/jwt/public.key
+###<jwt keys###

composer.json

@@ -19,41 +19,40 @@
         "nelmio/cors-bundle": "^2.5",
         "phpdocumentor/reflection-docblock": "^5.6",
         "phpstan/phpdoc-parser": "^2.1",
-        "symfony/asset": "7.2.*",
+        "symfony/asset": "7.4.*",
-        "symfony/asset-mapper": "7.2.*",
+        "symfony/asset-mapper": "7.4.*",
-        "symfony/console": "7.2.*",
+        "symfony/console": "7.4.*",
-        "symfony/doctrine-messenger": "7.2.*",
+        "symfony/doctrine-messenger": "7.4.*",
-        "symfony/dotenv": "7.2.*",
+        "symfony/dotenv": "7.4.*",
-        "symfony/expression-language": "7.2.*",
+        "symfony/expression-language": "7.4.*",
         "symfony/flex": "^2",
-        "symfony/form": "7.2.*",
+        "symfony/form": "7.4.*",
-        "symfony/framework-bundle": "7.2.*",
+        "symfony/framework-bundle": "7.4.*",
-        "symfony/http-client": "7.2.*",
+        "symfony/http-client": "7.4.*",
-        "symfony/intl": "7.2.*",
+        "symfony/intl": "7.4.*",
-        "symfony/mailer": "7.2.*",
+        "symfony/mailer": "7.4.*",
         "symfony/mercure-bundle": "^0.3.9",
-        "symfony/messenger": "7.2.*",
+        "symfony/messenger": "7.4.*",
-        "symfony/mime": "7.2.*",
+        "symfony/mime": "7.4.*",
         "symfony/monolog-bundle": "^3.10",
-        "symfony/notifier": "7.2.*",
+        "symfony/notifier": "7.4.*",
-        "symfony/process": "7.2.*",
+        "symfony/process": "7.4.*",
-        "symfony/property-access": "7.2.*",
+        "symfony/property-access": "7.4.*",
-        "symfony/property-info": "7.2.*",
+        "symfony/property-info": "7.4.*",
-        "symfony/rate-limiter": "7.2.*",
+        "symfony/rate-limiter": "7.4.*",
-        "symfony/runtime": "7.2.*",
+        "symfony/runtime": "7.4.*",
-        "runtime/frankenphp-symfony": "^0.2.0",
+        "symfony/security-bundle": "7.4.*",
-        "symfony/security-bundle": "7.2.*",
+        "symfony/serializer": "7.4.*",
-        "symfony/serializer": "7.2.*",
         "symfony/stimulus-bundle": "^2.24",
-        "symfony/string": "7.2.*",
+        "symfony/string": "7.4.*",
-        "symfony/translation": "7.2.*",
+        "symfony/translation": "7.4.*",
-        "symfony/twig-bundle": "7.2.*",
+        "symfony/twig-bundle": "7.4.*",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-toggle-password": "^2.24",
         "symfony/ux-turbo": "^2.24",
-        "symfony/validator": "7.2.*",
+        "symfony/validator": "7.4.*",
-        "symfony/web-link": "7.2.*",
+        "symfony/web-link": "7.4.*",
-        "symfony/yaml": "7.2.*",
+        "symfony/yaml": "7.4.*",
         "twig/twig": "^2.12|^3.0"
     },
     "config": {
@@ -104,18 +103,18 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.2.*"
+            "require": "7.4.*"
         }
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^8.3",
         "phpunit/phpunit": "^11.0",
-        "symfony/browser-kit": "7.2.*",
+        "symfony/browser-kit": "7.4.*",
-        "symfony/css-selector": "7.2.*",
+        "symfony/css-selector": "7.4.*",
-        "symfony/debug-bundle": "7.2.*",
+        "symfony/debug-bundle": "7.4.*",
         "symfony/maker-bundle": "^1.62",
-        "symfony/phpunit-bridge": "^7.2",
+        "symfony/phpunit-bridge": "7.4.*",
-        "symfony/stopwatch": "7.2.*",
+        "symfony/stopwatch": "7.4.*",
-        "symfony/web-profiler-bundle": "7.2.*"
+        "symfony/web-profiler-bundle": "7.4.*"
     }
 }