From 8d26cec3ab3d1cfc08658d2b3e798c45f244bd79 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Mon, 8 Dec 2025 09:39:12 +0100
Subject: [PATCH 1/2] upgrade phpunit configuration

---
 phpunit.xml.dist | 52 ++++++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b2f5b1f5..7c40c0ef 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
-         bootstrap="./vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true">
-    <php>
-        <env name="SHELL_VERBOSITY" value="-1" />
-        <server name="KERNEL_DIR" value="./tests/Resources/app" />
-        <server name="KERNEL_CLASS" value="AppKernel" />
-    </php>
-
-    <testsuites>
-        <testsuite name="HttplugBundle unit tests">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-        <testsuite name="HttplugBundle functional tests">
-            <directory suffix="Test.php">./tests/Functional</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <env name="SHELL_VERBOSITY" value="-1"/>
+    <server name="KERNEL_DIR" value="./tests/Resources/app"/>
+    <server name="KERNEL_CLASS" value="AppKernel"/>
+  </php>
+  <testsuites>
+    <testsuite name="HttplugBundle unit tests">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="HttplugBundle functional tests">
+      <directory suffix="Test.php">./tests/Functional</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

From 81c05d47114b86c794b4188bee2a93d79594e133 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Mon, 8 Dec 2025 09:42:00 +0100
Subject: [PATCH 2/2] test with php 8.5

---
 .github/workflows/continuous-integration.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 75e6f6da..a387e736 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -40,6 +40,9 @@ jobs:
           - dependencies: "php-http/guzzle7-adapter"
             php-version: "8.4"
             symfony-deprecations-helper: "weak"
+          - dependencies: "php-http/guzzle7-adapter"
+            php-version: "8.5"
+            symfony-deprecations-helper: "weak"
 
           # Test with httplug 2.x clients
           - dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev php-http/socket-client:^2.0"
@@ -48,11 +51,11 @@ jobs:
 
           # Latest commit to master
           - dependencies: "php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
-            php-version: "8.2"
+            php-version: "8.5"
             stability: "dev"
             symfony-deprecations-helper: "weak"
           - dependencies: "php-http/guzzle7-adapter"
-            php-version: "8.2"
+            php-version: "8.5"
             stability: "dev"
             symfony-deprecations-helper: "weak"
 
@@ -65,9 +68,9 @@ jobs:
             symfony-require: "6.4.*"
             php-version: "8.2"
             symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.3"
-            symfony-require: "7.3.*"
-            php-version: "8.2"
+          - dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.4"
+            symfony-require: "7.4.*"
+            php-version: "8.5"
             symfony-deprecations-helper: "weak"
 
     steps:
@@ -90,6 +93,7 @@ jobs:
 
       - name: "Add dependencies and enable flex"
         run: |
+          composer config allow-plugins.symfony/flex true
           composer require --no-update ${{ matrix.dependencies }}
 
       - name: "Install dependencies with Composer"