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

Conflicts: composer.json
sulu · Jan 10, 2025 · 53c8925 · 53c8925
2 parents cd339c8 + 60d628b
commit 53c8925
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -118,11 +118,11 @@
             "@auto-scripts"
         ],
         "post-root-package-install": [
+            "@php -r \"file_put_contents('.gitignore', str_replace(['composer.lock' . PHP_EOL, 'package-lock.json' . PHP_EOL, 'yarn.lock' . PHP_EOL, 'bun.lockb' . PHP_EOL, 'pnpm-lock.yaml' . PHP_EOL], '', file_get_contents('.gitignore')));\"",
             "@php -r \"file_put_contents('.env.local', 'APP_ENV=dev' . PHP_EOL);\"",
             "@php -r \"file_put_contents('.env', str_replace('APP_SECRET=\\'\\$ecretf0rt3st\\'', 'APP_SECRET=' . bin2hex(random_bytes(16)), file_get_contents('.env')));\""
         ],
         "post-create-project-cmd": [
-            "@php -r \"file_put_contents('.gitignore', str_replace(['composer.lock' . PHP_EOL, 'package-lock.json' . PHP_EOL, 'yarn.lock' . PHP_EOL, 'bun.lockb' . PHP_EOL, 'pnpm-lock.yaml' . PHP_EOL], '', file_get_contents('.gitignore')));\"",
             "@php bin/adminconsole sulu:admin:info --ansi"
         ],
         "serve": [

diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -17,3 +17,7 @@ when@test:
         test: true
         session:
             storage_factory_id: session.storage.factory.mock_file
+
+when@stage:
+    framework:
+        disallow_search_engine_index: true
diff --git a/...build/admin/main.7dd0d023ca48ee986043.css → ...build/admin/main.23106151c27dd616377c.css b/...build/admin/main.7dd0d023ca48ee986043.css → ...build/admin/main.23106151c27dd616377c.css
diff --git a/...d/admin/main.7dd0d023ca48ee986043.css.map → ...d/admin/main.23106151c27dd616377c.css.map b/...d/admin/main.7dd0d023ca48ee986043.css.map → ...d/admin/main.23106151c27dd616377c.css.map
diff --git a/public/build/admin/main.23106151c27dd616377c.js b/public/build/admin/main.23106151c27dd616377c.js
diff --git a/.../main.7dd0d023ca48ee986043.js.LICENSE.txt → .../main.23106151c27dd616377c.js.LICENSE.txt b/.../main.7dd0d023ca48ee986043.js.LICENSE.txt → .../main.23106151c27dd616377c.js.LICENSE.txt
diff --git a/...ld/admin/main.7dd0d023ca48ee986043.js.map → ...ld/admin/main.23106151c27dd616377c.js.map b/...ld/admin/main.7dd0d023ca48ee986043.js.map → ...ld/admin/main.23106151c27dd616377c.js.map
diff --git a/public/build/admin/main.7dd0d023ca48ee986043.js b/public/build/admin/main.7dd0d023ca48ee986043.js
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.7dd0d023ca48ee986043.css",
-  "main.js": "/build/admin/main.7dd0d023ca48ee986043.js",
+  "main.css": "/build/admin/main.23106151c27dd616377c.css",
+  "main.js": "/build/admin/main.23106151c27dd616377c.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.7dd0d023ca48ee986043.css.map",
-  "main.js.map": "/build/admin/main.7dd0d023ca48ee986043.js.map"
+  "main.css.map": "/build/admin/main.23106151c27dd616377c.css.map",
+  "main.js.map": "/build/admin/main.23106151c27dd616377c.js.map"
 }
diff --git a/tests/travis.php.ini b/tests/travis.php.ini