Add PHP 8.4 build, run tests with Symfony 7.3 and 7.4, add Symfony 8.0 support

mbabker · mbabker · commit f77fc5e24770 · 2025-08-13T14:46:12.000-04:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,19 +14,26 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         dependency:
           - ''
         symfony:
           - '5.4.*'
           - '6.4.*'
-          - '7.0.*'
+          - '7.3.*'
         include:
           - php: '8.1'
             symfony: '5.4.*'
             dependency: 'lowest'
+          - php: '8.4'
+            symfony: '7.4.*@dev'
+            dependency: ''
+          - php: '8.4'
+            symfony: '8.0.*@dev'
+            dependency: ''
         exclude:
           - php: '8.1'
-            symfony: '7.0.*'
+            symfony: '7.3.*'
       fail-fast: false
     steps:
       - name: Checkout
diff --git a/PhpUnit/AbstractCompilerPassTestCase.php b/PhpUnit/AbstractCompilerPassTestCase.php
@@ -2,7 +2,6 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
-use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -20,7 +19,6 @@ abstract protected function registerCompilerPass(ContainerBuilder $container): v
      * This test will run the compile method.
      */
     #[Test]
-    #[CoversNothing]
     final public function compilation_should_not_fail_with_empty_container(): void
     {
         try {
diff --git a/Tests/Fixtures/DependableExtension.php b/Tests/Fixtures/DependableExtension.php
@@ -3,27 +3,19 @@
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
-class DependableExtension implements ExtensionInterface
+class DependableExtension extends Extension
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
         if ($container->hasParameter('parameter_from_non_dependable')) {
             $container->setParameter('dependable_parameter', 'dependable value');
         }
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'dependable';
     }
-
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
 }
diff --git a/Tests/Fixtures/MatthiasDependencyInjectionTestExtension.php b/Tests/Fixtures/MatthiasDependencyInjectionTestExtension.php
@@ -5,13 +5,13 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MatthiasDependencyInjectionTestExtension implements ExtensionInterface
+class MatthiasDependencyInjectionTestExtension extends Extension
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
         // load some service definitions
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
@@ -41,16 +41,8 @@ public function load(array $config, ContainerBuilder $container): void
         $container->setDefinition('manual_with_reference', $definition);
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'matthias_dependency_injection_test';
     }
-
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
 }
diff --git a/Tests/Fixtures/NonDependablePrependableExtension.php b/Tests/Fixtures/NonDependablePrependableExtension.php
@@ -3,29 +3,21 @@
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
-class NonDependablePrependableExtension implements ExtensionInterface, PrependExtensionInterface
+class NonDependablePrependableExtension extends Extension implements PrependExtensionInterface
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'non_dependable';
     }
 
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
-
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $container->setParameter('parameter_from_non_dependable', 'non-dependable value');
     }
diff --git a/Tests/Fixtures/NonPrependableTestExtension.php b/Tests/Fixtures/NonPrependableTestExtension.php
@@ -3,29 +3,21 @@
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
-class NonPrependableTestExtension implements ExtensionInterface
+class NonPrependableTestExtension extends Extension
 {
     public function prepend(ContainerBuilder $container): void
     {
         $container->setParameter('ignored_invocation', 'ignored value');
     }
 
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'non_prependable_test';
     }
-
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
 }
diff --git a/Tests/Fixtures/PrependableTestExtension.php b/Tests/Fixtures/PrependableTestExtension.php
@@ -3,30 +3,22 @@
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
-class PrependableTestExtension implements ExtensionInterface, PrependExtensionInterface
+class PrependableTestExtension extends Extension implements PrependExtensionInterface
 {
     public function prepend(ContainerBuilder $container): void
     {
         $container->setParameter('prepend_parameter_set', 'prepended value');
     }
 
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'prependable_test';
     }
-
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
 }
diff --git a/Tests/Fixtures/SimpleExtension.php b/Tests/Fixtures/SimpleExtension.php
@@ -3,24 +3,16 @@
 namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
-class SimpleExtension implements ExtensionInterface
+class SimpleExtension extends Extension
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'simple';
     }
-
-    public function getNamespace(): void
-    {
-    }
-
-    public function getXsdValidationBasePath(): void
-    {
-    }
 }
diff --git a/composer.json b/composer.json
@@ -17,9 +17,9 @@
         "matthiasnoback/symfony-config-test": "^5.0 || ^6.0",
         "phpunit/phpunit": "^10.5.11 || ^11.0 || ^12.0",
         "sebastian/exporter": " ^5.0 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
-        "symfony/config": "^5.4 || ^6.2 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.2 || ^7.0"
+        "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
     },
     "autoload": {
         "psr-4" : { "Matthias\\SymfonyDependencyInjectionTest\\" : "" },
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0.x-dev"
+            "dev-master": "6.x-dev"
         }
     },
     "minimum-stability": "dev",

Original file line number	Diff line number	Diff line change
`@@ -3,27 +3,19 @@`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`		`-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`7`	`7`
`8`		`-class DependableExtension implements ExtensionInterface`
	`8`	`+class DependableExtension extends Extension`
`9`	`9`	`{`
`10`		`- public function load(array $config, ContainerBuilder $container): void`
	`10`	`+ public function load(array $configs, ContainerBuilder $container): void`
`11`	`11`	`{`
`12`	`12`	`if ($container->hasParameter('parameter_from_non_dependable')) {`
`13`	`13`	`$container->setParameter('dependable_parameter', 'dependable value');`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`- public function getAlias()`
	`17`	`+ public function getAlias(): string`
`18`	`18`	`{`
`19`	`19`	`return 'dependable';`
`20`	`20`	`}`
`21`		`-`
`22`		`- public function getNamespace(): void`
`23`		`- {`
`24`		`- }`
`25`		`-`
`26`		`- public function getXsdValidationBasePath(): void`
`27`		`- {`
`28`		`- }`
`29`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`	`use Symfony\Component\Config\FileLocator;`
`6`	`6`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`7`	`7`	`use Symfony\Component\DependencyInjection\Definition;`
`8`		`-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
	`8`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`9`	`9`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`10`	`10`	`use Symfony\Component\DependencyInjection\Reference;`
`11`	`11`
`12`		`-class MatthiasDependencyInjectionTestExtension implements ExtensionInterface`
	`12`	`+class MatthiasDependencyInjectionTestExtension extends Extension`
`13`	`13`	`{`
`14`		`- public function load(array $config, ContainerBuilder $container): void`
	`14`	`+ public function load(array $configs, ContainerBuilder $container): void`
`15`	`15`	`{`
`16`	`16`	`// load some service definitions`
`17`	`17`	`$loader = new XmlFileLoader($container, new FileLocator(__DIR__));`
`@@ -41,16 +41,8 @@ public function load(array $config, ContainerBuilder $container): void`
`41`	`41`	`$container->setDefinition('manual_with_reference', $definition);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function getAlias()`
	`44`	`+ public function getAlias(): string`
`45`	`45`	`{`
`46`	`46`	`return 'matthias_dependency_injection_test';`
`47`	`47`	`}`
`48`		`-`
`49`		`- public function getNamespace(): void`
`50`		`- {`
`51`		`- }`
`52`		`-`
`53`		`- public function getXsdValidationBasePath(): void`
`54`		`- {`
`55`		`- }`
`56`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,29 +3,21 @@`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`		`-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`7`	`7`	`use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;`
`8`	`8`
`9`		`-class NonDependablePrependableExtension implements ExtensionInterface, PrependExtensionInterface`
	`9`	`+class NonDependablePrependableExtension extends Extension implements PrependExtensionInterface`
`10`	`10`	`{`
`11`		`- public function load(array $config, ContainerBuilder $container): void`
	`11`	`+ public function load(array $configs, ContainerBuilder $container): void`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- public function getAlias()`
	`15`	`+ public function getAlias(): string`
`16`	`16`	`{`
`17`	`17`	`return 'non_dependable';`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function getNamespace(): void`
`21`		`- {`
`22`		`- }`
`23`		`-`
`24`		`- public function getXsdValidationBasePath(): void`
`25`		`- {`
`26`		`- }`
`27`		`-`
`28`		`- public function prepend(ContainerBuilder $container)`
	`20`	`+ public function prepend(ContainerBuilder $container): void`
`29`	`21`	`{`
`30`	`22`	`$container->setParameter('parameter_from_non_dependable', 'non-dependable value');`
`31`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,30 +3,22 @@`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`		`-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`7`	`7`	`use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;`
`8`	`8`
`9`		`-class PrependableTestExtension implements ExtensionInterface, PrependExtensionInterface`
	`9`	`+class PrependableTestExtension extends Extension implements PrependExtensionInterface`
`10`	`10`	`{`
`11`	`11`	`public function prepend(ContainerBuilder $container): void`
`12`	`12`	`{`
`13`	`13`	`$container->setParameter('prepend_parameter_set', 'prepended value');`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function load(array $config, ContainerBuilder $container): void`
	`16`	`+ public function load(array $configs, ContainerBuilder $container): void`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function getAlias()`
	`20`	`+ public function getAlias(): string`
`21`	`21`	`{`
`22`	`22`	`return 'prependable_test';`
`23`	`23`	`}`
`24`		`-`
`25`		`- public function getNamespace(): void`
`26`		`- {`
`27`		`- }`
`28`		`-`
`29`		`- public function getXsdValidationBasePath(): void`
`30`		`- {`
`31`		`- }`
`32`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,24 +3,16 @@`
`3`	`3`	`namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`6`		`-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\Extension;`
`7`	`7`
`8`		`-class SimpleExtension implements ExtensionInterface`
	`8`	`+class SimpleExtension extends Extension`
`9`	`9`	`{`
`10`		`- public function load(array $config, ContainerBuilder $container): void`
	`10`	`+ public function load(array $configs, ContainerBuilder $container): void`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`		`- public function getAlias()`
	`14`	`+ public function getAlias(): string`
`15`	`15`	`{`
`16`	`16`	`return 'simple';`
`17`	`17`	`}`
`18`		`-`
`19`		`- public function getNamespace(): void`
`20`		`- {`
`21`		`- }`
`22`		`-`
`23`		`- public function getXsdValidationBasePath(): void`
`24`		`- {`
`25`		`- }`
`26`	`18`	`}`