Merge branch 'release/2.6.0' into main

Pixel-Open · May 21, 2024 · b432553 · b432553
2 parents 2d9aadf + 9cccb2a
commit b432553
Show file tree

Hide file tree

Showing 6 changed files with 2,579 additions and 2,695 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.6.0 (21/05/2024)
+
++ Compatible with Sulu 2.6 and Symfony 6
+
 ## 2.5.8 (10/02/2023)
 
 - Fix sulu version

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "A Symfony Bundle for Sulu content management platform containing boilerplate blocks",
     "type": "library",
     "require": {
-        "php": "^7.4||^8.0",
+        "php": "^8.0",
         "pixeldev/protocol-stream": "^1.0",
         "sulu/sulu": "^2.4",
         "symfony/dependency-injection": "^5.0 || ^6.0",
@@ -27,7 +27,8 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": false
         }
     },
     "scripts": {