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

 Conflicts:
	composer.json
	public/build/admin/main.5aa9907fac1e57dd7f89.js.map
	public/build/admin/main.6778366c82fadad1b5f7.css
	public/build/admin/main.6778366c82fadad1b5f7.js
	public/build/admin/main.6778366c82fadad1b5f7.js.map
	public/build/admin/main.a5a185ce48d4ebdd1c1b.js.map
	public/build/admin/manifest.json

.github/workflows/test-application.yaml

@@ -168,6 +168,7 @@ jobs:
             SULU_ADMIN_EMAIL:
             DATABASE_URL: mysql://root:[email protected]:3306/sulu_test?serverVersion=${{ matrix.mysql-version }}
             COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            LOCK_DSN: flock
 
         strategy:
             fail-fast: false

README.md

@@ -14,7 +14,7 @@
         <img src="https://img.shields.io/github/tag/sulu/skeleton.svg" alt="GitHub tag (latest SemVer)">
     </a>
     <a href="https://github.com/sulu/skeleton/actions" target="_blank">
-        <img src="https://img.shields.io/github/workflow/status/sulu/skeleton/Test%20application.svg?label=test-workflow" alt="Test workflow status">
+        <img src="https://img.shields.io/github/actions/workflow/status/sulu/skeleton/test-application.yaml" alt="Test workflow status">
     </a>
 </p>
 <br/>

composer.json

@@ -39,6 +39,7 @@
         "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.6.0@dev",
         "symfony/config": "^6.2",
         "symfony/dotenv": "^6.2",
@@ -63,8 +64,8 @@
         "phpstan/phpstan-symfony": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.17.0",
-        "sulu/sulu-rector": "^0.1.5",
+        "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",

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

config/packages/stof_doctrine_extensions.yaml

@@ -2,3 +2,11 @@
 # See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
 stof_doctrine_extensions:
     default_locale: '%default_locale%'
+
+when@prod: &prod
+    stof_doctrine_extensions:
+        # fix issue with gedmo/extensions 1.8.0 and stof/doctrine-extensions-bundle: 3.12.0
+        # @see https://github.com/stof/StofDoctrineExtensionsBundle/issues/457
+        metadata_cache_pool: doctrine.system_cache_pool
+
+when@stage: *prod

public/build/admin/main.5aa9907fac1e57dd7f89.js.LICENSE.txt → public/build/admin/main.f0f646ace94670fc180d.js.LICENSE.txt

@@ -5,8 +5,8 @@ object-assign
 */
 
 /* @preserve
- * Leaflet 1.9.3, a JS library for interactive maps. https://leafletjs.com
- * (c) 2010-2022 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ * Leaflet 1.9.4, a JS library for interactive maps. https://leafletjs.com
+ * (c) 2010-2023 Vladimir Agafonkin, (c) 2010-2011 CloudMade
  */
 
 /*!

public/build/admin/manifest.json

@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.5aa9907fac1e57dd7f89.css",
-  "main.js": "/build/admin/main.5aa9907fac1e57dd7f89.js",
+  "main.css": "/build/admin/main.f0f646ace94670fc180d.css",
+  "main.js": "/build/admin/main.f0f646ace94670fc180d.js",
   "fonts/fa-solid-900.svg": "/build/admin/fonts/fa-solid-900.7a8b4f130182d19a2d7c67d80c090397.svg",
   "fonts/fa-brands-400.svg": "/build/admin/fonts/fa-brands-400.2f517e09eb2ca6650ff5bec5a95157ab.svg",
   "fonts/fa-solid-900.eot": "/build/admin/fonts/fa-solid-900.9bbb245e67a133f6e486d8d2545e14a5.eot",
@@ -77,6 +77,6 @@
   "images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f4777663e6f009f3.png",
   "images/marker-shadow.png": "/build/admin/images/marker-shadow.a0c6cc1401c107b501efee6477816891.png",
   "images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6e6ac284c2f4e.gif",
-  "main.css.map": "/build/admin/main.5aa9907fac1e57dd7f89.css.map",
-  "main.js.map": "/build/admin/main.5aa9907fac1e57dd7f89.js.map"
+  "main.css.map": "/build/admin/main.f0f646ace94670fc180d.css.map",
+  "main.js.map": "/build/admin/main.f0f646ace94670fc180d.js.map"
 }

rector.php

@@ -15,7 +15,12 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([__DIR__ . '/src', __DIR__ . '/tests']);
 
-    $rectorConfig->phpstanConfig(__DIR__ . '/phpstan.neon');
+    $rectorConfig->phpstanConfigs([
+        __DIR__ . '/phpstan.neon',
+        // rector does not load phpstan extension automatically so require them manually here:
+        __DIR__ . '/vendor/phpstan/phpstan-doctrine/extension.neon',
+        __DIR__ . '/vendor/phpstan/phpstan-symfony/extension.neon',
+    ]);
 
     // basic rules
     $rectorConfig->importNames();