Merge branch 'upgrade-sulu-2-6-7' into 'master'

Upgrade sulu to 2.6.7 See merge request webapps/sulu-demo!158
sulu · Feb 6, 2025 · 51c2c1a · 51c2c1a
2 parents 0dfb9f8 + 22d6b30
commit 51c2c1a
Show file tree

Hide file tree

Showing 13 changed files with 11,814 additions and 1,346 deletions.
diff --git a/assets/admin/package-lock.json b/assets/admin/package-lock.json
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.8",
-        "sulu/sulu": "~2.6.3",
+        "sulu/sulu": "^2.6.7",
         "symfony/config": "^6.4",
         "symfony/dotenv": "^6.4",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/router.php b/config/router.php
@@ -13,7 +13,6 @@
 
 // Workaround https://bugs.php.net/64566
 $autoPrependFile = \ini_get('auto_prepend_file');
-// @phpstan-ignore-next-line https://github.com/phpstan/phpstan/issues/7685
 if (false !== (bool) $autoPrependFile && !\in_array(\realpath($autoPrependFile), \get_included_files(), true)) {
     require \ini_get('auto_prepend_file');
 }

diff --git a/...build/admin/main.99d9d6b00a8ce8330921.css → ...build/admin/main.6ac266f08e2c460021aa.css b/...build/admin/main.99d9d6b00a8ce8330921.css → ...build/admin/main.6ac266f08e2c460021aa.css
diff --git a/public/build/admin/main.6ac266f08e2c460021aa.css.map b/public/build/admin/main.6ac266f08e2c460021aa.css.map
diff --git a/public/build/admin/main.6ac266f08e2c460021aa.js b/public/build/admin/main.6ac266f08e2c460021aa.js
diff --git a/.../main.99d9d6b00a8ce8330921.js.LICENSE.txt → .../main.6ac266f08e2c460021aa.js.LICENSE.txt b/.../main.99d9d6b00a8ce8330921.js.LICENSE.txt → .../main.6ac266f08e2c460021aa.js.LICENSE.txt
@@ -148,8 +148,6 @@ and limitations under the License.
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
-
 /** @license mobx-react v5.4.4
  * index.module.js
  *

diff --git a/...ld/admin/main.99d9d6b00a8ce8330921.js.map → ...ld/admin/main.6ac266f08e2c460021aa.js.map b/...ld/admin/main.99d9d6b00a8ce8330921.js.map → ...ld/admin/main.6ac266f08e2c460021aa.js.map
diff --git a/public/build/admin/main.99d9d6b00a8ce8330921.css.map b/public/build/admin/main.99d9d6b00a8ce8330921.css.map
diff --git a/public/build/admin/main.99d9d6b00a8ce8330921.js b/public/build/admin/main.99d9d6b00a8ce8330921.js
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.99d9d6b00a8ce8330921.css",
-  "main.js": "/build/admin/main.99d9d6b00a8ce8330921.js",
+  "main.css": "/build/admin/main.6ac266f08e2c460021aa.css",
+  "main.js": "/build/admin/main.6ac266f08e2c460021aa.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.99d9d6b00a8ce8330921.css.map",
-  "main.js.map": "/build/admin/main.99d9d6b00a8ce8330921.js.map"
+  "main.css.map": "/build/admin/main.6ac266f08e2c460021aa.css.map",
+  "main.js.map": "/build/admin/main.6ac266f08e2c460021aa.js.map"
 }
diff --git a/src/DataFixtures/ORM/AppFixture.php b/src/DataFixtures/ORM/AppFixture.php
@@ -639,7 +639,7 @@ private function createAnalytics(ObjectManager $manager, array $data): Analytics
     /**
      * @return array<string, mixed>
      */
-    public function getOrder()
+    public function getOrder(): int
     {
         return \PHP_INT_MAX;
     }