test merge api-platform

Astro-Otter-Space · Sep 25, 2024 · a9d557c · a9d557c
1 parent f233d74
commit a9d557c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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",