From c1e8294f777b642aad07e731bb6e4ceb0f533b24 Mon Sep 17 00:00:00 2001
From: Veyra Hermes Agent <veyra@vmi2752927.contaboserver.net>
Date: Mon, 15 Jun 2026 15:13:58 +0200
Subject: [PATCH] Add Symfony 8 and PHP 8.5 compatibility

---
 .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++++
 CHANGELOG.md                | 14 +++++++++++++
 composer.json               | 22 ++++++++++----------
 3 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2112df3..fc80a71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,6 +50,46 @@ jobs:
             - name: Run tests
               run: composer test
 
+    symfony8-php85-consumer-install:
+        name: Symfony 8 + PHP 8.5 consumer install
+        runs-on: ubuntu-22.04
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  ini-values: "memory_limit=-1"
+                  php-version: '8.5'
+                  tools: composer:v2
+
+            - name: Verify installability in a Symfony 8 consumer project
+              run: |
+                  mkdir /tmp/fob-symfony8-consumer
+                  cat > /tmp/fob-symfony8-consumer/composer.json <<'JSON'
+                  {
+                      "name": "friends-of-behat/symfony8-consumer-probe",
+                      "type": "project",
+                      "minimum-stability": "dev",
+                      "prefer-stable": true,
+                      "repositories": [
+                          {"type": "path", "url": "${{ github.workspace }}", "options": {"symlink": false}}
+                      ],
+                      "require-dev": {
+                          "behat/behat": "4.x-dev",
+                          "friends-of-behat/symfony-extension": "*",
+                          "symfony/framework-bundle": "^8.0",
+                          "symfony/yaml": "^8.0"
+                      },
+                      "config": {
+                          "sort-packages": true
+                      }
+                  }
+                  JSON
+                  composer update --working-dir=/tmp/fob-symfony8-consumer --no-interaction --no-plugins --prefer-dist --no-progress
+
     psalm:
         name: Run Psalm
         runs-on: ubuntu-22.04
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7987b79..722a4ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# CHANGELOG FOR `2.3.x`
+
+## v2.3.0 (unreleased)
+
+#### TL;DR
+
+- **Added installability support for Symfony 8 and PHP 8.5**.
+
+#### Details
+
+- Allow `symfony/dependency-injection` and `symfony/http-kernel` `^8.0`.
+- Allow Behat `^4.0`, which is required by Symfony 8 because Behat 3.x only supports Symfony components up to 7.x.
+- Keep Symfony 7.4 / Behat 3.31 compatibility and add a CI consumer-install probe for Symfony 8 on PHP 8.5.
+
 # CHANGELOG FOR `2.1.x`
 
 ## v2.2.0 (2021-02-04)
diff --git a/composer.json b/composer.json
index 02e8f71..8b79dd0 100644
--- a/composer.json
+++ b/composer.json
@@ -11,23 +11,23 @@
         }
     ],
     "require": {
-        "php": "^8.3",
-        "behat/behat": "^3.22",
-        "symfony/dependency-injection": "^7.4",
-        "symfony/http-kernel": "^7.4"
+        "php": ">=8.3 <8.6",
+        "behat/behat": "^3.31 || ^4.0",
+        "symfony/dependency-injection": "^7.4 || ^8.0",
+        "symfony/http-kernel": "^7.4 || ^8.0"
     },
     "require-dev": {
         "behat/mink-browserkit-driver": "^2.0",
         "behat/mink-selenium2-driver": "^1.3",
         "behat/mink": "^1.9",
         "friends-of-behat/mink-extension": "^2.5",
-        "friends-of-behat/page-object-extension": "^0.3.2",
-        "friends-of-behat/service-container-extension": "^1.1",
+        "friends-of-behat/page-object-extension": "^0.4",
+        "friends-of-behat/service-container-extension": "^2.0",
         "sylius-labs/coding-standard": ">=4.1.1, <=4.2.1",
-        "symfony/browser-kit": "^7.4",
-        "symfony/framework-bundle": "^7.4",
-        "symfony/process": "^7.4",
-        "symfony/yaml": "^7.4",
+        "symfony/browser-kit": "^7.4 || ^8.0",
+        "symfony/framework-bundle": "^7.4 || ^8.0",
+        "symfony/process": "^7.4 || ^8.0",
+        "symfony/yaml": "^7.4 || ^8.0",
         "vimeo/psalm": "^6.0"
     },
     "suggest": {
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "2.3-dev"
         }
     },
     "autoload": {
-- 
2.49.1