refactor: fix deprecation on http kernel dependency injection extension

Author: deguif

DependencyInjection/Compiler/IntegrationPass.php

@@ -23,8 +23,9 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class IntegrationPass implements CompilerPassInterface
+final class IntegrationPass implements CompilerPassInterface
 {
+    #[\Override()]
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('translation.loader.xliff')) {

DependencyInjection/Compiler/MountDumpersPass.php

@@ -26,8 +26,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MountDumpersPass implements CompilerPassInterface
+final class MountDumpersPass implements CompilerPassInterface
 {
+    #[\Override()]
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('jms_translation.file_writer')) {

DependencyInjection/Compiler/MountExtractorsPass.php

@@ -25,8 +25,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MountExtractorsPass implements CompilerPassInterface
+final class MountExtractorsPass implements CompilerPassInterface
 {
+    #[\Override()]
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('jms_translation.extractor_manager')) {

DependencyInjection/Compiler/MountFileVisitorsPass.php

@@ -24,8 +24,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MountFileVisitorsPass implements CompilerPassInterface
+final class MountFileVisitorsPass implements CompilerPassInterface
 {
+    #[\Override()]
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('jms_translation.extractor.file_extractor')) {

DependencyInjection/Compiler/MountLoadersPass.php

@@ -26,8 +26,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MountLoadersPass implements CompilerPassInterface
+final class MountLoadersPass implements CompilerPassInterface
 {
+    #[\Override()]
     public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('jms_translation.loader_manager')) {

DependencyInjection/Configuration.php

@@ -22,28 +22,21 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
-    private ContainerBuilder $container;
-
-    public function __construct(ContainerBuilder $container)
-    {
-        $this->container = $container;
+    public function __construct(
+        /** @var array<string, class-string<BundleInterface>> */
+        private array $bundles,
+    ) {
     }
 
+    #[\Override()]
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $c = $this->container;
-
-        $tb = new TreeBuilder('jms_translation');
-        // Keep compatibility with symfony/config < 4.2
-        if (!method_exists($tb, 'getRootNode')) {
-            $rootNode = $tb->root('jms_translation');
-        } else {
-            $rootNode = $tb->getRootNode();
-        }
+        $treeBuilder = new TreeBuilder('jms_translation');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->fixXmlConfig('config')
@@ -77,7 +70,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->requiresAtLeastOneElement()
                                 ->prototype('scalar')
                                     ->validate()
-                                        ->always(static function ($v) use ($c) {
+                                        ->always(function ($v): string {
                                             $v = str_replace(DIRECTORY_SEPARATOR, '/', $v);
 
                                             if ('@' === $v[0]) {
@@ -87,12 +80,11 @@ public function getConfigTreeBuilder(): TreeBuilder
                                                     $bundleName = substr($v, 1, $pos - 1);
                                                 }
 
-                                                $bundles = $c->getParameter('kernel.bundles');
-                                                if (!isset($bundles[$bundleName])) {
-                                                    throw new \Exception(sprintf('The bundle "%s" does not exist. Available bundles: %s', $bundleName, implode(', ', array_keys($bundles))));
+                                                if (null === $bundleClass = ($this->bundles[$bundleName] ?? null)) {
+                                                    throw new \Exception(sprintf('The bundle "%s" does not exist. Available bundles: %s', $bundleName, implode(', ', array_keys($this->bundles))));
                                                 }
 
-                                                $ref = new \ReflectionClass($bundles[$bundleName]);
+                                                $ref = new \ReflectionClass($bundleClass);
                                                 $v = false === $pos ? dirname($ref->getFileName()) : dirname($ref->getFileName()) . substr($v, $pos);
                                             }
 
@@ -130,6 +122,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
             ->end();
 
-        return $tb;
+        return $treeBuilder;
     }
 }

DependencyInjection/JMSTranslationExtension.php

@@ -24,14 +24,21 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class JMSTranslationExtension extends Extension
+final class JMSTranslationExtension extends Extension
 {
+    #[\Override()]
+    public function getConfiguration(array $config, ContainerBuilder $container): Configuration
+    {
+        return new Configuration($container->getParameter('kernel.bundles'));
+    }
+
+    #[\Override()]
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $config = $this->processConfiguration(new Configuration($container), $configs);
+        $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.xml');

JMSTranslationBundle.php

@@ -26,10 +26,11 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class JMSTranslationBundle extends Bundle
+final class JMSTranslationBundle extends Bundle
 {
-    const VERSION = '1.1.0-DEV';
+    public const VERSION = '3.0.0-DEV';
 
+    #[\Override()]
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new IntegrationPass());

Tests/DependencyInjection/JMSTranslationExtensionTest.php

@@ -5,6 +5,7 @@
 namespace JMS\TranslationBundle\Tests\DependencyInjection;
 
 use JMS\TranslationBundle\DependencyInjection\JMSTranslationExtension;
+use JMS\TranslationBundle\JMSTranslationBundle;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use PHPUnit\Framework\Attributes\Test;
 
@@ -13,6 +14,13 @@
  */
 class JMSTranslationExtensionTest extends AbstractExtensionTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->container->setParameter('kernel.bundles', ['JMSTranslationBundle' => JMSTranslationBundle::class]);
+    }
+
     protected function getContainerExtensions(): array
     {
         return [