Merge 3.x into 4.x

sonata-project · Dec 25, 2023 · 3900bc8 · 3900bc8
2 parents 9f5e488 + 2245f5e
commit 3900bc8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -57,6 +57,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
 
         steps:
             - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.8.0](https://github.com/sonata-project/SonataSeoBundle/compare/3.7.0...3.8.0) - 2023-12-24
+### Added
+- [[#733](https://github.com/sonata-project/SonataSeoBundle/pull/733)] Support for Symfony 7 ([@abdellahrk](https://github.com/abdellahrk))
+
 ## [3.7.0](https://github.com/sonata-project/SonataSeoBundle/compare/3.6.0...3.7.0) - 2023-06-04
 ### Added
 - [[#725](https://github.com/sonata-project/SonataSeoBundle/pull/725)] Support for SonataBlockBundle 5.0 ([@jordisala1991](https://github.com/jordisala1991))

diff --git a/composer.json b/composer.json
@@ -24,13 +24,13 @@
         "ext-json": "*",
         "sonata-project/block-bundle": "^4.18 || ^5.0",
         "sonata-project/exporter": "^2.0 || ^3.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/options-resolver": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/form": "^5.4 || ^6.2 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
@@ -45,11 +45,11 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "rector/rector": "^0.18",
-        "symfony/console": "^5.4 || ^6.2",
-        "symfony/filesystem": "^5.4 || ^6.2",
-        "symfony/finder": "^5.4 || ^6.2",
+        "symfony/console": "^5.4 || ^6.2 || ^7.0",
+        "symfony/filesystem": "^5.4 || ^6.2 || ^7.0",
+        "symfony/finder": "^5.4 || ^6.2 || ^7.0",
         "symfony/phpunit-bridge": "^6.2",
-        "symfony/yaml": "^5.4 || ^6.2",
+        "symfony/yaml": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "^5.0"
     },
     "minimum-stability": "dev",