Merge remote-tracking branch 'origin/11.2' into 11.x

dvesh3 · Jul 1, 2024 · 0a3f73d · 0a3f73d
2 parents 7dbd1a5 + f1fa051
commit 0a3f73d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -130,16 +130,16 @@
     "umpirsky/country-list": "^2.0.6"
   },
   "conflict": {
-    "symfony/symfony": "*",
     "sabre/dav": "4.2.2",
+    "symfony/symfony": "*",
     "thecodingmachine/safe": "<2.0",
     "twig/twig": ">=3.9.0"
   },
   "require-dev": {
     "codeception/codeception": "^5.0.3",
     "codeception/module-symfony": "^3.1.0",
     "ergebnis/phpstan-rules": "^2.0",
-    "phpstan/phpstan": "1.11.2",
+    "phpstan/phpstan": "1.11.5",
     "phpstan/phpstan-symfony": "^1.3.5",
     "phpunit/phpunit": "^9.3",
     "gotenberg/gotenberg-php": "^1.1 || ^2.4",

diff --git a/tests/Support/Resources/system_settings.json b/tests/Support/Resources/system_settings.json
@@ -9,7 +9,7 @@
     ],
     "fallback_languages": {
       "en": "",
-      "de": ""
+      "de": "en"
     },
     "default_language": "",
     "debug_admin_translations": false