Allow Symfony 8

Author: nicolas-grekas

.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.*'

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": {

src/TestKernel.php

@@ -69,9 +69,9 @@ public function __construct(string $environment, bool $debug)
     }
 
     /**
-     * @psalm-param class-string<BundleInterface> $bundleClassName
-     *
      * @param string $bundleClassName
+     *
+     * @psalm-param class-string<BundleInterface> $bundleClassName
      */
     public function addTestBundle($bundleClassName): void
     {

src/config/parameters.php

@@ -1,5 +1,9 @@
 <?php
 
+if (!method_exists('Symfony\Component\DependencyInjection\ContainerBuilder', 'getAutoconfiguredAttributes')) {
+    return; // Symfony 8
+}
+
 // If annotations aren't installed, disable it.
 if (!class_exists('Doctrine\Common\Annotations\Annotation')) {
     $container->loadFromExtension('framework', [

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');

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;

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();