From e16f61ce197fe4de4ca87f5ffdd4e3c3f5779382 Mon Sep 17 00:00:00 2001
From: Sebastiaan Stok <s.stok@rollerscapes.net>
Date: Mon, 1 Dec 2025 13:10:17 +0100
Subject: [PATCH] Add Symfony 8 support

Drop support for Symfony 6 and PHP 8.1
---
 .github/workflows/ci.yaml                 | 15 +++------------
 Makefile                                  |  3 +++
 composer.json                             | 20 ++++++++++----------
 tests/Bundle/BundleInitializationTest.php |  2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2e7a2db..c4c3ff3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -103,25 +103,16 @@ jobs:
         strategy:
             matrix:
                 include:
-                    -
-                        php-version: '8.1'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '6.3'
                     -
                         php-version: '8.2'
                         composer-options: '--prefer-stable'
-                        symfony-version: '^6.4'
-
-                    -
-                        php-version: '8.2'
-                        composer-options: '--prefer-stable'
-                        symfony-version: '^6.4'
+                        symfony-version: '^7.4'
                         remove-http-client: 'yes'
 
                     -
-                        php-version: '8.2'
+                        php-version: '8.4'
                         composer-options: '--prefer-stable'
-                        symfony-version: '^7.0'
+                        symfony-version: '^8.0'
 
         steps:
             -
diff --git a/Makefile b/Makefile
index 7af6b83..2ba1948 100644
--- a/Makefile
+++ b/Makefile
@@ -1 +1,4 @@
 include vendor/rollerscapes/standards/Makefile
+
+phpunit:
+	./vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 74abf6f..7a327a3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,23 +15,23 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "jeremykendall/php-domain-parser": "^6.3",
         "psr/simple-cache": "^1.0 || ^3.0",
-        "symfony/cache": "^6.3 || ^7.0"
+        "symfony/cache": "^7.4 || ^8.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
-        "nyholm/symfony-bundle-test": "^2.0",
-        "phpunit/phpunit": "^9.6.13",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1 || ^6.2",
+        "nyholm/symfony-bundle-test": "^2.0 || ^3.1",
+        "phpunit/phpunit": "^10.0",
         "rollerscapes/standards": "^1.0",
-        "symfony/console": "^6.3",
-        "symfony/framework-bundle": "^6.3 || ^7.0",
-        "symfony/http-client": "^6.3 || ^7.0",
-        "symfony/phpunit-bridge": "^6.3 || ^7.0"
+        "symfony/console": "^7.4 || ^8.0",
+        "symfony/framework-bundle": "^7.4 || ^8.0",
+        "symfony/http-client": "^7.4 || ^8.0",
+        "symfony/phpunit-bridge": "^7.4 || ^8.0"
     },
     "conflict": {
-        "symfony/framework-bundle": "<6.0"
+        "symfony/framework-bundle": "<7.4"
     },
     "suggest": {
         "rollerworks/pdb-validator": "PHP domain-parser Constraints for Symfony Validator component"
diff --git a/tests/Bundle/BundleInitializationTest.php b/tests/Bundle/BundleInitializationTest.php
index d634963..8e3aebe 100644
--- a/tests/Bundle/BundleInitializationTest.php
+++ b/tests/Bundle/BundleInitializationTest.php
@@ -36,7 +36,7 @@ protected static function createKernel(array $options = []): KernelInterface
         /** @var TestKernel $kernel */
         $kernel = parent::createKernel($options);
         $kernel->addTestCompilerPass(new class implements CompilerPassInterface {
-            public function process(ContainerBuilder $container)
+            public function process(ContainerBuilder $container): void
             {
                 $container->findDefinition('rollerworks_pdb.pdb_manager')->setPublic(true);
             }