Merge branch '2.4' of github.com:sulu/skeleton into 2.5

Conflicts: composer.json public/build/admin/main.7f3a326ce042053b04b2.css public/build/admin/main.7f3a326ce042053b04b2.js public/build/admin/main.7f3a326ce042053b04b2.js.map public/build/admin/main.a5a185ce48d4ebdd1c1b.js public/build/admin/main.a5a185ce48d4ebdd1c1b.js.map public/build/admin/main.ef2a1fc36ddb231793ff.js public/build/admin/main.ef2a1fc36ddb231793ff.js.map public/build/admin/manifest.json
sulu · Aug 3, 2023 · 48b03b7 · 48b03b7
2 parents a514be7 + 4994709
commit 48b03b7
Show file tree

Hide file tree

Showing 6 changed files with 490 additions and 481 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "scheb/2fa-email": "^6.1",
         "scheb/2fa-trusted-device": "^6.1",
         "stof/doctrine-extensions-bundle": "^1.8",
-        "sulu/sulu": "~2.5.9",
+        "sulu/sulu": "~2.5.10",
         "symfony/config": "^6.2",
         "symfony/dotenv": "^6.2",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/config/packages/http_discovery.yaml b/config/packages/http_discovery.yaml
@@ -0,0 +1,10 @@
+services:
+    Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory'
+
+    http_discovery.psr17_factory:
+        class: Http\Discovery\Psr17Factory
diff --git a/...build/admin/main.a5a185ce48d4ebdd1c1b.css → ...build/admin/main.6778366c82fadad1b5f7.css b/...build/admin/main.a5a185ce48d4ebdd1c1b.css → ...build/admin/main.6778366c82fadad1b5f7.css
diff --git a/.../build/admin/main.a5a185ce48d4ebdd1c1b.js → .../build/admin/main.6778366c82fadad1b5f7.js b/.../build/admin/main.a5a185ce48d4ebdd1c1b.js → .../build/admin/main.6778366c82fadad1b5f7.js
diff --git a/...ld/admin/main.a5a185ce48d4ebdd1c1b.js.map → ...ld/admin/main.6778366c82fadad1b5f7.js.map b/...ld/admin/main.a5a185ce48d4ebdd1c1b.js.map → ...ld/admin/main.6778366c82fadad1b5f7.js.map
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,7 +1,7 @@
 {
-  "main.css": "/build/admin/main.a5a185ce48d4ebdd1c1b.css",
-  "main.js": "/build/admin/main.a5a185ce48d4ebdd1c1b.js",
-  "main.js.map": "/build/admin/main.a5a185ce48d4ebdd1c1b.js.map",
+  "main.css": "/build/admin/main.6778366c82fadad1b5f7.css",
+  "main.js": "/build/admin/main.6778366c82fadad1b5f7.js",
+  "main.js.map": "/build/admin/main.6778366c82fadad1b5f7.js.map",
   "build/admin/fonts/fa-brands-400.woff": "/build/admin/fonts/fa-brands-400.2285773e6b4b172f07d9b777c81b0775.woff",
   "build/admin/fonts/fa-brands-400.eot": "/build/admin/fonts/fa-brands-400.23f19bb08961f37aaf692ff943823453.eot",
   "build/admin/fonts/fa-brands-400.svg": "/build/admin/fonts/fa-brands-400.2f517e09eb2ca6650ff5bec5a95157ab.svg",