symfony · WedgeSama · Mar 30, 2025 · yceruto · May 28, 2025 · Neirda24
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -245,6 +245,9 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
                     ->info('Form configuration')
                     ->{$enableIfStandalone('symfony/form', Form::class)}()
                     ->children()
+                        ->booleanNode('use_attribute')
+                            ->defaultFalse()
+                        ->end()
                         ->arrayNode('csrf_protection')
                             ->treatFalseLike(['enabled' => false])
                             ->treatTrueLike(['enabled' => true])

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -82,6 +82,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\Glob;
+use Symfony\Component\Form\Attribute\AsFormType;
 use Symfony\Component\Form\Extension\HtmlSanitizer\Type\TextTypeHtmlSanitizerExtension;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormTypeExtensionInterface;
@@ -891,6 +892,18 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
             $container->setParameter('form.type_extension.csrf.enabled', false);
         }
 
+        if ($config['form']['use_attribute']) {
+            $loader->load('form_metadata.php');
+
+            $container->registerAttributeForAutoconfiguration(AsFormType::class, static function (ChildDefinition $definition, AsFormType $attribute, \ReflectionClass $ref) {
+                $definition
+                    ->addTag('container.excluded.form.metadata.form_type', ['class_name' => $ref->getName()])
+                    ->addTag('container.excluded')
+                    ->setAbstract(true)
+                ;
+            });
+        }
+
         if (!ContainerBuilder::willBeAvailable('symfony/translation', Translator::class, ['symfony/framework-bundle', 'symfony/form'])) {
             $container->removeDefinition('form.type_extension.upload.validator');
         }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -335,6 +335,7 @@
                 [], // All type extensions are stored here by FormPass
                 [], // All type guessers are stored here by FormPass
                 service('debug.file_link_formatter')->nullOnInvalid(),
+                [], // All metadata form types are stored here by FormPass
             ])
             ->tag('console.command')
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_metadata.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_metadata.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\Form\Extension\Metadata\MetadataExtension;
+use Symfony\Component\Form\Metadata\Loader\AttributeLoader;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('form.metadata.attribute_loader', AttributeLoader::class)
+
+        ->alias('form.metadata.default_loader', 'form.metadata.attribute_loader')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -751,6 +751,7 @@ protected static function getBundleDefaultConfig()
                     'field_attr' => ['data-controller' => 'csrf-protection'],
                     'token_id' => null,
                 ],
+                'use_attribute' => false,
             ],
             'esi' => ['enabled' => false],
             'ssi' => ['enabled' => false],

@@ -63,4 +63,9 @@ public function getBlockPrefix()
     {
         return StringUtil::fqcnToBlockPrefix(static::class) ?: '';
     }
+
+    final public function getClassName(): string
+    {
+        return static::class;
+    }
 }
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Attribute;
+
+/**
+ * Register a model class (e.g. DTO, entity, model, etc...) as a FormType.
+ *
+ * @author Benjamin Georgeault <git@wedgesama.fr>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final readonly class AsFormType
+{
+    /**
+     * @param array<string, mixed> $options
+     */
+    public function __construct(
+        private array $options = [],
+    ) {
+    }
+
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+}
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Attribute;
+
+/**
+ * Add an AsFormType class property as a FormType's field.
+ *
+ * @author Benjamin Georgeault <git@wedgesama.fr>
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+final readonly class Type
+{
+    /**
+     * @param class-string|null    $type
+     * @param array<string, mixed> $options
+     */
+    public function __construct(
+        private ?string $type = null,
+        private array $options = [],
+    ) {
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * @return class-string|null
+     */
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+}
@@ -42,6 +42,7 @@ public function __construct(
         private array $extensions = [],
         private array $guessers = [],
         private ?FileLinkFormatter $fileLinkFormatter = null,
+        private array $metadataTypes = [],
     ) {
         parent::__construct();
     }
@@ -95,6 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $object = null;
             $options['core_types'] = $this->getCoreTypes();
             $options['service_types'] = array_values(array_diff($this->types, $options['core_types']));
+            $options['metadata_types'] = $this->metadataTypes;
             if ($input->getOption('show-deprecated')) {
                 $options['core_types'] = $this->filterTypesByDeprecated($options['core_types']);
                 $options['service_types'] = $this->filterTypesByDeprecated($options['service_types']);
@@ -150,7 +152,7 @@ private function getFqcnTypeClass(InputInterface $input, SymfonyStyle $io, strin
         if (0 === $count = \count($classes)) {
             $message = \sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces));
 
-            $allTypes = array_merge($this->getCoreTypes(), $this->types);
+            $allTypes = array_merge($this->getCoreTypes(), $this->types, $this->metadataTypes);
             if ($alternatives = $this->findAlternatives($shortClassName, $allTypes)) {
                 if (1 === \count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
@@ -238,7 +240,7 @@ private function findAlternatives(string $name, array $collection): array
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestArgumentValuesFor('class')) {
-            $suggestions->suggestValues(array_merge($this->getCoreTypes(), $this->types));
+            $suggestions->suggestValues(array_merge($this->getCoreTypes(), $this->types, $this->metadataTypes));
 
             return;
         }

@@ -25,6 +25,7 @@ protected function describeDefaults(array $options): void
     {
         $data['builtin_form_types'] = $options['core_types'];
         $data['service_form_types'] = $options['service_types'];
+        $data['metadata_form_types'] = $options['metadata_types'];
         if (!$options['show_deprecated']) {
             $data['type_extensions'] = $options['extensions'];
             $data['type_guessers'] = $options['guessers'];

@@ -44,6 +44,11 @@ protected function describeDefaults(array $options): void
             $this->output->listing(array_map($this->formatClassLink(...), $options['service_types']));
         }
 
+        if ($options['metadata_types']) {
+            $this->output->section('Metadata form types');
+            $this->output->listing(array_map($this->formatClassLink(...), $options['metadata_types']));
+        }
+
         if (!$options['show_deprecated']) {
             if ($options['extensions']) {
                 $this->output->section('Type extensions');

@@ -17,8 +17,11 @@
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Form\Extension\Metadata\Type\MetadataType;
+use Symfony\Component\Form\Metadata\FormMetadataInterface;
 
 /**
  * Adds all services with the tags "form.type", "form.type_extension" and
@@ -46,6 +49,7 @@ private function processFormTypes(ContainerBuilder $container): Reference
     {
         // Get service locator argument
         $servicesMap = [];
+        $metadataTypeMap = [];
         $namespaces = ['Symfony\Component\Form\Extension\Core\Type' => true];
         $csrfTokenIds = [];
 
@@ -61,10 +65,33 @@ private function processFormTypes(ContainerBuilder $container): Reference
             }
         }
 
+        foreach ($container->findTaggedResourceIds('container.excluded.form.metadata.form_type') as $excludedServiceId => $tag) {
+            if (!isset($tag[0]['class_name'])) {
+                throw new InvalidArgumentException(\sprintf('The excluded service "%s" with tag "container.excluded.form.metadata.form_type" must have the tag\'s attribute "class_name" set.', $excludedServiceId));
+            }
+
+            $className = $tag[0]['class_name'];
+            $formTypeId = $excludedServiceId.'.form_type';
+            $metadataId = $excludedServiceId.'.metadata';
+
+            $container->setDefinition($metadataId, new Definition(FormMetadataInterface::class))
+                ->setFactory([new Reference('form.metadata.default_loader'), 'load'])
+                ->addArgument($className)
+                ->addTag('form.metadata');
+
+            $container->setDefinition($formTypeId, new Definition(MetadataType::class))
+                ->addArgument(new Reference($metadataId))
+                ->addTag('form.metadata_type', ['class_name' => $className]);
+
+            $metadataTypeMap[$className] = new Reference($formTypeId);
+            $namespaces[substr($className, 0, strrpos($className, '\\'))] = true;
+        }
+
         if ($container->hasDefinition('console.command.form_debug')) {
             $commandDefinition = $container->getDefinition('console.command.form_debug');
             $commandDefinition->setArgument(1, array_keys($namespaces));
             $commandDefinition->setArgument(2, array_keys($servicesMap));
+            $commandDefinition->setArgument(6, array_keys($metadataTypeMap));
         }
 
         if ($csrfTokenIds && $container->hasDefinition('form.type_extension.csrf')) {
@@ -75,7 +102,7 @@ private function processFormTypes(ContainerBuilder $container): Reference
             }
         }
 
-        return ServiceLocatorTagPass::register($container, $servicesMap);
+        return ServiceLocatorTagPass::register($container, [...$servicesMap, ...$metadataTypeMap]);
     }
 
     private function processFormTypeExtensions(ContainerBuilder $container): array

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Exception;
+
+/**
+ * Thrown when an error occurred during Metadata creation.
+ *
+ * @author Benjamin Georgeault <git@wedgesama.fr>
+ */
+class MetadataException extends LogicException
+{
+}
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Metadata;
+
+use Symfony\Component\Form\Exception\InvalidArgumentException;
+use Symfony\Component\Form\Exception\MetadataException;
+use Symfony\Component\Form\Extension\Metadata\Type\MetadataType;
+use Symfony\Component\Form\FormExtensionInterface;
+use Symfony\Component\Form\FormTypeGuesserInterface;
+use Symfony\Component\Form\FormTypeInterface;
+use Symfony\Component\Form\Metadata\Loader\LoaderInterface;
+
+/**
+ * Responsible for instantiating FormType based on a {@see \Symfony\Component\Form\Metadata\FormMetadataInterface}.
+ *
+ * @author Benjamin Georgeault <git@wedgesama.fr>
+ */
+final class MetadataExtension implements FormExtensionInterface
+{
+    /**
+     * @var array<class-string, FormTypeInterface>
+     */
+    private array $loadedTypes = [];
+
+    public function __construct(
+        private readonly LoaderInterface $loader,
+    ) {
+    }
+
+    public function getType(string $name): FormTypeInterface
+    {
+        if (null !== $type = $this->loadedTypes[$name] ?? null) {
+            return $type;
+        }
+
+        try {
+            return $this->loadedTypes[$name] = new MetadataType($this->loader->load($name));
+        } catch (MetadataException $e) {
+            throw new InvalidArgumentException(\sprintf('Cannot instantiate a "%s" for the given class "%s".', FormTypeInterface::class, $name), previous: $e);
+        }
+    }
+
+    public function hasType(string $name): bool
+    {
+        return ($this->loadedTypes[$name] ?? false) || $this->loader->support($name);
+    }
+
+    public function getTypeExtensions(string $name): array
+    {
+        return [];
+    }
+
+    public function hasTypeExtensions(string $name): bool
+    {
+        return false;
+    }
+
+    public function getTypeGuesser(): ?FormTypeGuesserInterface
+    {
+        return null;
+    }
+}