From 3ca40717ff37b7205481526447128fb50f43d859 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Wed, 3 Dec 2025 17:00:18 +0100
Subject: [PATCH] allow installation with symfony 8 and test with php 8.5

---
 .github/workflows/php.yml |  6 ++++--
 CHANGELOG.md              |  6 ++++++
 composer.json             | 32 ++++++++++++++++----------------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2c7bf86d..24208bdb 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -28,13 +28,15 @@ jobs:
           - php-version: '8.3'
             symfony-version: '7.*'
           - php-version: '8.4'
-            symfony-version: '7.*'
+            symfony-version: '8.*'
+          - php-version: '8.5'
+            symfony-version: '8.*'
           # Minimum supported dependencies with the oldest PHP version
           - php-version: '8.1'
             composer-flag: '--prefer-stable --prefer-lowest'
             symfony-version: '6.4'
           # Test latest unreleased versions
-          - php-version: '8.4'
+          - php-version: '8.5'
             stability: 'dev'
 
     name: PHP ${{ matrix.php-version }} Test on Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}} ${{ matrix.stability }} ${{ matrix.composer-flag }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d9bd588..6f883bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ Changelog
 3.x
 ===
 
+3.2.1
+-----
+
+* Compatibility with Symfony 8.
+* Tested with php 8.5.
+
 3.2.0
 -----
 
diff --git a/composer.json b/composer.json
index b69ddd0b..7bbfeba6 100644
--- a/composer.json
+++ b/composer.json
@@ -30,12 +30,12 @@
     "require": {
         "php": "^8.1",
         "friendsofsymfony/http-cache": "^3.0",
-        "symfony/dependency-injection": "^6.4 || ^7.0",
-        "symfony/expression-language": "^6.4 || ^7.0",
-        "symfony/framework-bundle": "^6.4 || ^7.0",
-        "symfony/http-foundation": "^6.4 || ^7.0",
-        "symfony/http-kernel": "^6.4 || ^7.0",
-        "symfony/security-bundle": "^6.4 || ^7.0"
+        "symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0",
+        "symfony/expression-language": "^6.4 || ^7.0 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0",
+        "symfony/http-foundation": "^6.4 || ^7.0 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.0 || ^8.0",
+        "symfony/security-bundle": "^6.4 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "php-http/guzzle7-adapter": "^0.1.1",
@@ -45,18 +45,18 @@
         "guzzlehttp/guzzle": "^7.2",
         "mockery/mockery": "^1.6.9",
         "monolog/monolog": "*",
-        "symfony/browser-kit": "^6.4 || ^7.0",
-        "symfony/console": "^6.4 || ^7.0",
-        "symfony/finder": "^6.4 || ^7.0",
+        "symfony/browser-kit": "^6.4 || ^7.0 || ^8.0",
+        "symfony/console": "^6.4 || ^7.0 || ^8.0",
+        "symfony/finder": "^6.4 || ^7.0 || ^8.0",
         "phpunit/phpunit": "^10.5",
-        "symfony/twig-bundle": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0 || ^8.0",
         "twig/twig": "^v3.8",
-        "symfony/yaml": "^6.4 || ^7.0",
-        "symfony/css-selector": "^6.4 || ^7.0",
-        "symfony/monolog-bundle": "^3.0",
-        "symfony/routing": "^6.4 || ^7.0",
-        "matthiasnoback/symfony-config-test": "^4.3.0 || ^5.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
+        "symfony/yaml": "^6.4 || ^7.0 || ^8.0",
+        "symfony/css-selector": "^6.4 || ^7.0 || ^8.0",
+        "symfony/monolog-bundle": "*",
+        "symfony/routing": "^6.4 || ^7.0 || ^8.0",
+        "matthiasnoback/symfony-config-test": "^5.2 || ^6.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1 || ^6.2",
         "phpstan/phpstan": "^2",
         "phpstan/phpstan-symfony": "^2",
         "phpstan/extension-installer": "^1.4",