Skip to content

Commit 6685482

Browse files
Allow Symfony 8
1 parent 241bf0e commit 6685482

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
- '6.3.*'
2727
- '6.4.*'
2828
- '7.0.*'
29+
include:
30+
- php: '8.4'
31+
symfony: '8.0.*'
2932
exclude:
3033
- php: '7.2'
3134
symfony: '6.0.*'

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
],
1515
"require": {
1616
"php": "^7.2.5 || ^8.0",
17-
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
18-
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
19-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
20-
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
21-
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
17+
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
18+
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0 || ^8.0",
19+
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
20+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
21+
"symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0"
2222
},
2323
"require-dev": {
2424
"phpunit/phpunit": "^8.5 || ^9.4"
@@ -40,7 +40,7 @@
4040
},
4141
"extra": {
4242
"branch-alias": {
43-
"dev-master": "2.0-dev"
43+
"dev-master": "3.x-dev"
4444
}
4545
},
4646
"scripts": {

src/config/parameters.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
if (!method_exists('Symfony\Component\DependencyInjection\ContainerBuilder', 'getAutoconfiguredAttributes')) {
4+
return; // Symfony 8
5+
}
6+
37
// If annotations aren't installed, disable it.
48
if (!class_exists('Doctrine\Common\Annotations\Annotation')) {
59
$container->loadFromExtension('framework', [

tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/DeRegisterSomethingPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class DeRegisterSomethingPass implements CompilerPassInterface
99
{
10-
public function process(ContainerBuilder $container)
10+
public function process(ContainerBuilder $container): void
1111
{
1212
if ($container->hasDefinition('something')) {
1313
$container->removeDefinition('something');

tests/Fixtures/ConfigurationBundle/DependencyInjection/Compiler/RegisterSomethingPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class RegisterSomethingPass implements CompilerPassInterface
1010
{
11-
public function process(ContainerBuilder $container)
11+
public function process(ContainerBuilder $container): void
1212
{
1313
if ($container->hasDefinition('something')) {
1414
return;

tests/Functional/BundleShutdownTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public function testCleanupTemporaryDirectories(): void
2424
$filesystem = new Filesystem();
2525

2626
self::assertTrue($filesystem->exists($cacheDirectory));
27-
self::assertTrue($filesystem->exists($logDirectory));
2827

2928
self::ensureKernelShutdown();
3029

0 commit comments

Comments
 (0)