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

Conflicts: composer.json public/build/admin/main.6778366c82fadad1b5f7.js public/build/admin/main.6778366c82fadad1b5f7.js.map public/build/admin/main.6d56d2cf15b101a74302.css public/build/admin/main.6d56d2cf15b101a74302.js public/build/admin/main.6d56d2cf15b101a74302.js.map public/build/admin/main.7f3a326ce042053b04b2.js public/build/admin/main.7f3a326ce042053b04b2.js.map public/build/admin/manifest.json
sulu · Dec 14, 2023 · e530c27 · e530c27
2 parents 2047fa7 + 8699375
commit e530c27
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,7 @@ node_modules
 
 # System files
 .DS_Store
+
+###> phpstan/phpstan ###
+phpstan.neon
+###< phpstan/phpstan ###
diff --git a/composer.json b/composer.json
@@ -33,46 +33,46 @@
         "dantleech/phpcr-migrations-bundle": "^1.3",
         "doctrine/doctrine-bundle": "^2.5",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
-        "friendsofsymfony/http-cache-bundle": "^2.10.1",
+        "friendsofsymfony/http-cache-bundle": "^2.17",
         "handcraftedinthealps/zendsearch": "^2.1",
-        "jackalope/jackalope-doctrine-dbal": "^1.7",
+        "jackalope/jackalope-doctrine-dbal": "^1.10",
         "scheb/2fa-bundle": "^6.1",
         "scheb/2fa-email": "^6.1",
         "scheb/2fa-trusted-device": "^6.1",
         "stof/doctrine-extensions-bundle": "^1.8",
-        "sulu/sulu": "~2.5.10",
-        "symfony/config": "^6.2",
-        "symfony/dotenv": "^6.2",
+        "sulu/sulu": "~2.5.11",
+        "symfony/config": "^6.3",
+        "symfony/dotenv": "^6.3",
         "symfony/flex": "^1.17 || ^2.0",
-        "symfony/framework-bundle": "^6.2",
-        "symfony/mailer": "^6.2",
-        "symfony/monolog-bridge": "^6.2",
+        "symfony/framework-bundle": "^6.3",
+        "symfony/mailer": "^6.3",
+        "symfony/monolog-bridge": "^6.3",
         "symfony/monolog-bundle": "^3.4",
-        "symfony/runtime": "^6.2",
-        "symfony/security-bundle": "^6.2",
-        "symfony/twig-bundle": "^6.2"
+        "symfony/runtime": "^6.3",
+        "symfony/security-bundle": "^6.3",
+        "symfony/twig-bundle": "^6.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.9",
+        "friendsofphp/php-cs-fixer": "^3.41",
         "jangregor/phpstan-prophecy": "^1.0",
-        "phpcr/phpcr-shell": "^1.4",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.4",
-        "phpstan/phpstan-doctrine": "^1.2",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-symfony": "^1.1",
-        "phpstan/phpstan-webmozart-assert": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpcr/phpcr-shell": "^1.5",
+        "phpspec/prophecy-phpunit": "^2.1",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-symfony": "^1.3",
+        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.18.3",
         "sulu/sulu-rector": "^0.1.6",
-        "symfony/browser-kit": "^6.2",
-        "symfony/css-selector": "^6.2",
-        "symfony/debug-bundle": "^6.2",
-        "symfony/error-handler": "^6.2",
-        "symfony/phpunit-bridge": "^6.2",
+        "symfony/browser-kit": "^6.3",
+        "symfony/css-selector": "^6.3",
+        "symfony/debug-bundle": "^6.3",
+        "symfony/error-handler": "^6.3",
+        "symfony/phpunit-bridge": "^6.3",
         "symfony/thanks": "^1.2",
-        "symfony/web-profiler-bundle": "^6.2",
+        "symfony/web-profiler-bundle": "^6.3",
         "thecodingmachine/phpstan-strict-rules": "^1.0"
     },
     "autoload": {

diff --git a/phpstan.neon → phpstan.dist.neon b/phpstan.neon → phpstan.dist.neon
diff --git a/...build/admin/main.6778366c82fadad1b5f7.css → ...build/admin/main.57356961d1814657a5b8.css b/...build/admin/main.6778366c82fadad1b5f7.css → ...build/admin/main.57356961d1814657a5b8.css
diff --git a/.../build/admin/main.6778366c82fadad1b5f7.js → .../build/admin/main.57356961d1814657a5b8.js b/.../build/admin/main.6778366c82fadad1b5f7.js → .../build/admin/main.57356961d1814657a5b8.js
diff --git a/...ld/admin/main.6778366c82fadad1b5f7.js.map → ...ld/admin/main.57356961d1814657a5b8.js.map b/...ld/admin/main.6778366c82fadad1b5f7.js.map → ...ld/admin/main.57356961d1814657a5b8.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.6778366c82fadad1b5f7.css",
-  "main.js": "/build/admin/main.6778366c82fadad1b5f7.js",
-  "main.js.map": "/build/admin/main.6778366c82fadad1b5f7.js.map",
+  "main.css": "/build/admin/main.57356961d1814657a5b8.css",
+  "main.js": "/build/admin/main.57356961d1814657a5b8.js",
+  "main.js.map": "/build/admin/main.57356961d1814657a5b8.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",