From 01088bbf37d996fd8dd5eb8c10f59074b9c30a02 Mon Sep 17 00:00:00 2001 From: Leah Date: Thu, 22 Jan 2026 16:39:48 +0100 Subject: [PATCH 1/4] Add Support for Symfony 8 --- .github/workflows/code_style_and_tests.yml | 14 ++++++-------- composer.json | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code_style_and_tests.yml b/.github/workflows/code_style_and_tests.yml index 7470561..7bb574e 100644 --- a/.github/workflows/code_style_and_tests.yml +++ b/.github/workflows/code_style_and_tests.yml @@ -44,17 +44,15 @@ jobs: continue-on-error: true strategy: matrix: - php: ['7.3', '8.1', '8.2', '8.3'] - symfony: ['~5.0', '~6.0', '~7.0'] + php: ['8.2', '8.3', '8.4', '8.5'] + symfony: ['^6.4', '^7.0', '^8.0'] dependencies: - 'highest' exclude: - - php: '7.3' - symfony: '~6.0' - - php: '7.3' - symfony: '~7.0' - - php: '8.1' - symfony: '~7.0' + - php: '8.2' + symfony: '^8.0' + - php: '8.3' + symfony: '~8.0' fail-fast: false steps: - name: 'Start ClamAV daemon (clamd)' diff --git a/composer.json b/composer.json index aec723d..0ed0502 100644 --- a/composer.json +++ b/composer.json @@ -13,10 +13,10 @@ ], "require": { "php": "^7.3 || ^8.0", - "symfony/http-kernel": "~4.0 || ~5.0 || ~6.0 || ~7.0", - "symfony/config": "~4.0 || ~5.0 || ~6.0 || ~7.0", - "symfony/dependency-injection": "~4.0 || ~5.0 || ~6.0 || ~7.0", - "symfony/yaml": "~4.0 || ~5.0 || ~6.0 || ~7.0", + "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0 || ^8.0", + "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0 || ^8.0", + "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0", "ext-sockets": "*" }, "require-dev": { From 197cf563d91fde2fe09c0d078a19131b23b31091 Mon Sep 17 00:00:00 2001 From: Leah Date: Thu, 22 Jan 2026 17:06:36 +0100 Subject: [PATCH 2/4] Fix Tests --- src/Bundle/DependencyInjection/SineflowClamAVExtension.php | 2 +- tests/Functional/BundleTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/DependencyInjection/SineflowClamAVExtension.php b/src/Bundle/DependencyInjection/SineflowClamAVExtension.php index fc66c9c..3fb3653 100644 --- a/src/Bundle/DependencyInjection/SineflowClamAVExtension.php +++ b/src/Bundle/DependencyInjection/SineflowClamAVExtension.php @@ -9,7 +9,7 @@ class SineflowClamAVExtension extends Extension { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); diff --git a/tests/Functional/BundleTest.php b/tests/Functional/BundleTest.php index 74459af..c70b1ea 100644 --- a/tests/Functional/BundleTest.php +++ b/tests/Functional/BundleTest.php @@ -17,7 +17,7 @@ public function registerBundles(): iterable new SineflowClamAVBundle(), ]; } - public function registerContainerConfiguration(LoaderInterface $loader) + public function registerContainerConfiguration(LoaderInterface $loader): void { } } From ae3f15490b687ec2fcc86d8a14615082958dfe34 Mon Sep 17 00:00:00 2001 From: Leah Date: Fri, 23 Jan 2026 10:41:21 +0100 Subject: [PATCH 3/4] Fix Tests --- .github/workflows/code_style_and_tests.yml | 2 +- tests/Functional/ScannerTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code_style_and_tests.yml b/.github/workflows/code_style_and_tests.yml index 7bb574e..d7a09da 100644 --- a/.github/workflows/code_style_and_tests.yml +++ b/.github/workflows/code_style_and_tests.yml @@ -52,7 +52,7 @@ jobs: - php: '8.2' symfony: '^8.0' - php: '8.3' - symfony: '~8.0' + symfony: '^8.0' fail-fast: false steps: - name: 'Start ClamAV daemon (clamd)' diff --git a/tests/Functional/ScannerTest.php b/tests/Functional/ScannerTest.php index 3b411b3..577bc94 100644 --- a/tests/Functional/ScannerTest.php +++ b/tests/Functional/ScannerTest.php @@ -111,7 +111,7 @@ public function validFilesToCheckProvider() [realpath(__DIR__.'/../Files/clean.txt'), false, ''], [realpath(__DIR__.'/../Files/eicar.txt'), true, 'Win.Test.EICAR_HDB-1'], [realpath(__DIR__.'/../Files/eicar-dropper.pdf'), true, 'Pdf.Dropper.Agent-6299400-0'], - [realpath(__DIR__.'/../Files/infected-archive.zip'), true, 'Win.Test.EICAR_HDB-1'], + [realpath(__DIR__.'/../Files/infected-archive.zip'), true, 'Eicar-Test-Signature'], ]; } From c620213f2359be3e5ba8eb31b487c1b412ee67b2 Mon Sep 17 00:00:00 2001 From: Leah Date: Fri, 23 Jan 2026 10:43:29 +0100 Subject: [PATCH 4/4] Fix Tests --- tests/Functional/ScannerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Functional/ScannerTest.php b/tests/Functional/ScannerTest.php index 577bc94..623c06c 100644 --- a/tests/Functional/ScannerTest.php +++ b/tests/Functional/ScannerTest.php @@ -109,7 +109,7 @@ public function validFilesToCheckProvider() { return [ [realpath(__DIR__.'/../Files/clean.txt'), false, ''], - [realpath(__DIR__.'/../Files/eicar.txt'), true, 'Win.Test.EICAR_HDB-1'], + [realpath(__DIR__.'/../Files/eicar.txt'), true, 'Eicar-Test-Signature'], [realpath(__DIR__.'/../Files/eicar-dropper.pdf'), true, 'Pdf.Dropper.Agent-6299400-0'], [realpath(__DIR__.'/../Files/infected-archive.zip'), true, 'Eicar-Test-Signature'], ];