diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86a2429..dcda152 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ jobs: - '6.3.*' - '6.4.*' - '7.0.*' + include: + - php: '8.4' + symfony: '8.0.*' exclude: - php: '7.2' symfony: '6.0.*' diff --git a/composer.json b/composer.json index 062dbdd..489e08e 100644 --- a/composer.json +++ b/composer.json @@ -14,11 +14,11 @@ ], "require": { "php": "^7.2.5 || ^8.0", - "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", - "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.4" @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.x-dev" } }, "scripts": { diff --git a/src/TestKernel.php b/src/TestKernel.php index d9ddf5b..e2f710a 100644 --- a/src/TestKernel.php +++ b/src/TestKernel.php @@ -69,9 +69,9 @@ public function __construct(string $environment, bool $debug) } /** - * @psalm-param class-string $bundleClassName - * * @param string $bundleClassName + * + * @psalm-param class-string $bundleClassName */ public function addTestBundle($bundleClassName): void { diff --git a/src/config/parameters.php b/src/config/parameters.php index 8544366..01a2d20 100644 --- a/src/config/parameters.php +++ b/src/config/parameters.php @@ -1,5 +1,9 @@ loadFromExtension('framework', [ diff --git a/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/DeRegisterSomethingPass.php b/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/DeRegisterSomethingPass.php index 350664e..e03529b 100644 --- a/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/DeRegisterSomethingPass.php +++ b/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/DeRegisterSomethingPass.php @@ -7,7 +7,7 @@ class DeRegisterSomethingPass implements CompilerPassInterface { - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { if ($container->hasDefinition('something')) { $container->removeDefinition('something'); diff --git a/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/RegisterSomethingPass.php b/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/RegisterSomethingPass.php index 86590ea..ea2fcab 100644 --- a/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/RegisterSomethingPass.php +++ b/tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/RegisterSomethingPass.php @@ -8,7 +8,7 @@ class RegisterSomethingPass implements CompilerPassInterface { - public function process(ContainerBuilder $container) + public function process(ContainerBuilder $container): void { if ($container->hasDefinition('something')) { return; diff --git a/tests/Functional/BundleShutdownTest.php b/tests/Functional/BundleShutdownTest.php index f8b50f7..5261fd7 100644 --- a/tests/Functional/BundleShutdownTest.php +++ b/tests/Functional/BundleShutdownTest.php @@ -24,7 +24,6 @@ public function testCleanupTemporaryDirectories(): void $filesystem = new Filesystem(); self::assertTrue($filesystem->exists($cacheDirectory)); - self::assertTrue($filesystem->exists($logDirectory)); self::ensureKernelShutdown();