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

Conflicts: composer.json public/build/admin/main.2db16dded2300b31a974.js.map public/build/admin/main.b4a32339220be4433260.css public/build/admin/main.b4a32339220be4433260.js public/build/admin/main.b4a32339220be4433260.js.map public/build/admin/main.e03b63637014e59a633b.js.map public/build/admin/manifest.json
sulu · Jun 27, 2024 · 8ac058b · 8ac058b
2 parents 724aa9e + 1e9546d
commit 8ac058b
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,8 @@ node_modules
 ###> phpstan/phpstan ###
 phpstan.neon
 ###< phpstan/phpstan ###
+
+###> php-cs-fixer/shim ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< php-cs-fixer/shim ###
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.11",
-        "sulu/sulu": "~2.6.2@dev",
+        "sulu/sulu": "~2.6.3",
         "symfony/config": "^6.4",
         "symfony/dotenv": "^6.4",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/public/build/admin/main.2db16dded2300b31a974.js b/public/build/admin/main.2db16dded2300b31a974.js
diff --git a/...build/admin/main.2db16dded2300b31a974.css → ...build/admin/main.99d9d6b00a8ce8330921.css b/...build/admin/main.2db16dded2300b31a974.css → ...build/admin/main.99d9d6b00a8ce8330921.css
diff --git a/...d/admin/main.2db16dded2300b31a974.css.map → ...d/admin/main.99d9d6b00a8ce8330921.css.map b/...d/admin/main.2db16dded2300b31a974.css.map → ...d/admin/main.99d9d6b00a8ce8330921.css.map
diff --git a/public/build/admin/main.99d9d6b00a8ce8330921.js b/public/build/admin/main.99d9d6b00a8ce8330921.js
diff --git a/.../main.2db16dded2300b31a974.js.LICENSE.txt → .../main.99d9d6b00a8ce8330921.js.LICENSE.txt b/.../main.2db16dded2300b31a974.js.LICENSE.txt → .../main.99d9d6b00a8ce8330921.js.LICENSE.txt
diff --git a/...ld/admin/main.2db16dded2300b31a974.js.map → ...ld/admin/main.99d9d6b00a8ce8330921.js.map b/...ld/admin/main.2db16dded2300b31a974.js.map → ...ld/admin/main.99d9d6b00a8ce8330921.js.map
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.2db16dded2300b31a974.css",
-  "main.js": "/build/admin/main.2db16dded2300b31a974.js",
+  "main.css": "/build/admin/main.99d9d6b00a8ce8330921.css",
+  "main.js": "/build/admin/main.99d9d6b00a8ce8330921.js",
   "fa-solid-900.svg": "/build/admin/fa-solid-900.7a8b4f130182d19a2d7c.svg",
   "fa-brands-400.svg": "/build/admin/fa-brands-400.2f517e09eb2ca6650ff5.svg",
   "fa-solid-900.eot": "/build/admin/fa-solid-900.9bbb245e67a133f6e486.eot",
@@ -77,6 +77,6 @@
   "images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f477.png",
   "images/marker-shadow.png": "/build/admin/images/marker-shadow.a0c6cc1401c107b501ef.png",
   "images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6.gif",
-  "main.css.map": "/build/admin/main.2db16dded2300b31a974.css.map",
-  "main.js.map": "/build/admin/main.2db16dded2300b31a974.js.map"
+  "main.css.map": "/build/admin/main.99d9d6b00a8ce8330921.css.map",
+  "main.js.map": "/build/admin/main.99d9d6b00a8ce8330921.js.map"
 }
diff --git a/symfony.lock b/symfony.lock
@@ -106,6 +106,18 @@
     "massive/search-bundle": {
         "version": "2.9.1"
     },
+    "php-cs-fixer/shim": {
+        "version": "3.59",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "3.0",
+            "ref": "16422bf8eac6c3be42afe07d37e2abc89d2bdf6b"
+        },
+        "files": [
+            ".php-cs-fixer.dist.php"
+        ]
+    },
     "php-http/discovery": {
         "version": "1.19",
         "recipe": {