[DependencyInjection][Config] Remove support for the fluent PHP config format

Author: nicolas-grekas

CHANGELOG.md

@@ -13,6 +13,7 @@ CHANGELOG
  * Remove `!tagged` tag, use `!tagged_iterator` instead
  * Add argument `$target` to `ContainerBuilder::registerAliasForArgument()`
  * Remove support for the XML configuration format
+ * Remove the fluent PHP format for semantic configuration, instantiate builders inline with the config array as argument and return them instead
 
 7.4
 ---

Extension/ExtensionTrait.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Extension;
 
-use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Config\Loader\LoaderResolver;
@@ -51,12 +50,11 @@ private function executeConfiguratorCallback(ContainerBuilder $container, \Closu
 
     private function createContainerLoader(ContainerBuilder $container, string $env, bool $prepend): DelegatingLoader
     {
-        $buildDir = $container->getParameter('kernel.build_dir');
         $locator = new FileLocator();
         $resolver = new LoaderResolver([
             new YamlFileLoader($container, $locator, $env, $prepend),
             new IniFileLoader($container, $locator, $env),
-            class_exists(ConfigBuilderGenerator::class) ? new PhpFileLoader($container, $locator, $env, new ConfigBuilderGenerator($buildDir), $prepend) : new PhpFileLoader($container, $locator, $env, $prepend),
+            new PhpFileLoader($container, $locator, $env, $prepend),
             new GlobFileLoader($container, $locator, $env),
             new DirectoryLoader($container, $locator, $env),
             new ClosureLoader($container, $env),

Loader/PhpFileLoader.php

@@ -11,19 +11,12 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
-use Symfony\Component\Config\Builder\ConfigBuilderGeneratorInterface;
-use Symfony\Component\Config\Builder\ConfigBuilderInterface;
-use Symfony\Component\Config\FileLocatorInterface;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\DependencyInjection\Attribute\WhenNot;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\App;
 use Symfony\Component\DependencyInjection\Loader\Configurator\AppReference;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -40,24 +33,6 @@ class PhpFileLoader extends FileLoader
 {
     protected bool $autoRegisterAliasesForSinglyImplementedInterfaces = false;
 
-    private ?ConfigBuilderGeneratorInterface $generator;
-
-    public function __construct(
-        ContainerBuilder $container,
-        FileLocatorInterface $locator,
-        ?string $env = null,
-        ConfigBuilderGeneratorInterface|bool|null $generator = null,
-        bool $prepend = false,
-    ) {
-        if (\is_bool($generator)) {
-            $prepend = $generator;
-            $generator = null;
-        }
-        $this->generator = $generator;
-
-        parent::__construct($container, $locator, $env, $prepend);
-    }
-
     public function load(mixed $resource, ?string $type = null): mixed
     {
         // the container and loader variables are exposed to the included file below
@@ -160,7 +135,6 @@ private function callConfigurator(callable $callback, ContainerConfigurator $con
     {
         $callback = $callback(...);
         $arguments = [];
-        $configBuilders = [];
         $r = new \ReflectionFunction($callback);
 
         $excluded = true;
@@ -217,14 +191,7 @@ private function callConfigurator(callable $callback, ContainerConfigurator $con
                     }
                     // no break
                 default:
-                    try {
-                        $configBuilder = $this->configBuilder($type);
-                    } catch (InvalidArgumentException|\LogicException $e) {
-                        throw new \InvalidArgumentException(\sprintf('Could not resolve argument "%s" for "%s".', $type.' $'.$parameter->getName(), $path), 0, $e);
-                    }
-                    trigger_deprecation('symfony/dependency-injection', '7.4', 'Using fluent builders for semantic configuration is deprecated, instantiate the "%s" class with the config array as argument and return it instead in "%s".', $type, $path);
-                    $configBuilders[] = $configBuilder;
-                    $arguments[] = $configBuilder;
+                    throw new \InvalidArgumentException(\sprintf('Could not resolve argument "%s" for "%s".', $type.' $'.$parameter->getName(), $path));
             }
         }
 
@@ -234,62 +201,5 @@ private function callConfigurator(callable $callback, ContainerConfigurator $con
         } finally {
             --$this->importing;
         }
-
-        foreach ($configBuilders as $configBuilder) {
-            $this->loadExtensionConfig($configBuilder->getExtensionAlias(), ContainerConfigurator::processValue($configBuilder->toArray()));
-        }
-    }
-
-    /**
-     * @param string $namespace FQCN string for a class implementing ConfigBuilderInterface
-     */
-    private function configBuilder(string $namespace): ConfigBuilderInterface
-    {
-        if (!class_exists(ConfigBuilderGenerator::class)) {
-            throw new \LogicException('You cannot use the config builder as the Config component is not installed. Try running "composer require symfony/config".');
-        }
-
-        if (null === $this->generator) {
-            throw new \LogicException('You cannot use the ConfigBuilders without providing a class implementing ConfigBuilderGeneratorInterface.');
-        }
-
-        // If class exists and implements ConfigBuilderInterface
-        if (class_exists($namespace) && is_subclass_of($namespace, ConfigBuilderInterface::class)) {
-            return new $namespace();
-        }
-
-        // If it does not start with Symfony\Config\ we don't know how to handle this
-        if (!str_starts_with($namespace, 'Symfony\\Config\\')) {
-            throw new InvalidArgumentException(\sprintf('Could not find or generate class "%s".', $namespace));
-        }
-
-        // Try to get the extension alias
-        $alias = Container::underscore(substr($namespace, 15, -6));
-
-        if (str_contains($alias, '\\')) {
-            throw new InvalidArgumentException('You can only use "root" ConfigBuilders from "Symfony\\Config\\" namespace. Nested classes like "Symfony\\Config\\Framework\\CacheConfig" cannot be used.');
-        }
-
-        if (!$this->container->hasExtension($alias)) {
-            $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
-            throw new InvalidArgumentException(UndefinedExtensionHandler::getErrorMessage($namespace, null, $alias, $extensions));
-        }
-
-        $extension = $this->container->getExtension($alias);
-        if (!$extension instanceof ConfigurationExtensionInterface) {
-            throw new \LogicException(\sprintf('You cannot use the config builder for "%s" because the extension does not implement "%s".', $namespace, ConfigurationExtensionInterface::class));
-        }
-
-        $configuration = $extension->getConfiguration([], $this->container);
-        $loader = $this->generator->build($configuration);
-
-        return $loader();
     }
 }
-
-/**
- * @internal
- */
-final class ProtectedPhpFileLoader extends PhpFileLoader
-{
-}

Tests/Extension/AbstractExtensionTest.php

@@ -182,7 +182,6 @@ protected function createContainerBuilder(): ContainerBuilder
     {
         return new ContainerBuilder(new ParameterBag([
             'kernel.environment' => 'test',
-            'kernel.build_dir' => 'test',
         ]));
     }
 }

Tests/Fixtures/AcmeConfig.php

@@ -16,7 +16,6 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -59,7 +58,7 @@ public function testPrependExtensionConfigWithLoadMethod()
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
         $container->prependExtensionConfig('acme', ['foo' => 'bar']);
-        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', prepend: true);
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', true);
         $loader->load('config_builder.php');
 
         $expected = [
@@ -75,7 +74,7 @@ public function testPrependExtensionConfigWithImportMethod()
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
         $container->prependExtensionConfig('acme', ['foo' => 'bar']);
-        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', prepend: true);
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', true);
         $loader->import('config_builder.php');
 
         $expected = [
@@ -242,20 +241,6 @@ public function testEnumeration()
         $this->assertSame([FooUnitEnum::BAR], $definition->getArguments());
     }
 
-    #[IgnoreDeprecations]
-    #[Group('legacy')]
-    public function testNestedBundleConfigNotAllowed()
-    {
-        $fixtures = realpath(__DIR__.'/../Fixtures');
-        $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
-
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessageMatches('/^'.preg_quote('Could not resolve argument "Symfony\\Config\\AcmeConfig\\NestedConfig $config"', '/').'/');
-
-        $loader->load($fixtures.'/config/nested_bundle_config.php');
-    }
-
     public function testWhenEnv()
     {
         $this->expectNotToPerformAssertions();