From a9d557cca68754eed00908dfaacd34f531adfb91 Mon Sep 17 00:00:00 2001
From: "Astro Otter [PROD]" <astro.otter.space@gmail.com>
Date: Wed, 25 Sep 2024 10:52:57 +0200
Subject: [PATCH] test merge api-platform

---
 api/config/packages/api_platform.yaml | 5 +++++
 api/symfony.lock                      | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml
index 72542df..c3c78af 100644
--- a/api/config/packages/api_platform.yaml
+++ b/api/config/packages/api_platform.yaml
@@ -19,6 +19,7 @@ api_platform:
         extra_properties:
             standard_put: true
             rfc_7807_compliant_errors: true
+<<<<<<< ours
     swagger:
         api_keys:
             JWT:
@@ -39,3 +40,7 @@ when@prod:
         enable_entrypoint: false
         enable_swagger: false
         enable_swagger_ui: false
+=======
+    keep_legacy_inflector: false
+    use_symfony_listeners: true
+>>>>>>> theirs
diff --git a/api/symfony.lock b/api/symfony.lock
index 30e6dff..6cf559f 100644
--- a/api/symfony.lock
+++ b/api/symfony.lock
@@ -1,11 +1,11 @@
 {
     "api-platform/core": {
-        "version": "3.2",
+        "version": "3.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "3.2",
-            "ref": "696d44adc3c0d4f5d25a2f1c4f3700dd8a5c6db9"
+            "version": "3.3",
+            "ref": "74b45ac570c57eb1fbe56c984091a9ff87e18bab"
         },
         "files": [
             "config/packages/api_platform.yaml",