[UX3] Remove TwigComponent deprecations

Author: smnandre

src/TwigComponent/src/ComponentAttributes.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\UX\TwigComponent;
 
+use BadMethodCallException;
 use Symfony\UX\StimulusBundle\Dto\StimulusAttributes;
+use Symfony\UX\TwigComponent\Exception\RuntimeException;
 use Symfony\WebpackEncoreBundle\Dto\AbstractStimulusDto;
 use Twig\Runtime\EscaperRuntime;
 
@@ -47,6 +49,10 @@ public function __toString(): string
                 continue;
             }
 
+            if (null === $value) {
+                throw new RuntimeException('Attribute values cannot be null. If you want to remove an attribute, use the "remove()" method.');
+            }
+
             if (false === $value) {
                 continue;
             }
@@ -60,11 +66,6 @@ public function __toString(): string
                 continue;
             }
 
-            if (null === $value) {
-                trigger_deprecation('symfony/ux-twig-component', '2.8.0', 'Passing "null" as an attribute value is deprecated and will throw an exception in 3.0.');
-                $value = true;
-            }
-
             if (!\is_scalar($value) && !($value instanceof \Stringable)) {
                 throw new \LogicException(\sprintf('A "%s" prop was passed when creating the component. No matching "%s" property or mount() argument was found, so we attempted to use this as an HTML attribute. But, the value is not a scalar (it\'s a "%s"). Did you mean to pass this to your component or is there a typo on its name?', $key, $key, get_debug_type($value)));
             }
@@ -198,33 +199,6 @@ public function without(string ...$keys): self
         return $clone;
     }
 
-    public function add($stimulusDto): self
-    {
-        if ($stimulusDto instanceof AbstractStimulusDto) {
-            trigger_deprecation('symfony/ux-twig-component', '2.9.0', 'Passing a StimulusDto to ComponentAttributes::add() is deprecated. Run "composer require symfony/stimulus-bundle" then use "attributes.defaults(stimulus_controller(\'...\'))".');
-        } elseif ($stimulusDto instanceof StimulusAttributes) {
-            trigger_deprecation('symfony/ux-twig-component', '2.9.0', 'Calling ComponentAttributes::add() is deprecated. Instead use "attributes.defaults(stimulus_controller(\'...\'))".');
-
-            return $this->defaults($stimulusDto);
-        } else {
-            throw new \InvalidArgumentException(\sprintf('Argument 1 passed to "%s()" must be an instance of "%s" or "%s", "%s" given.', __METHOD__, AbstractStimulusDto::class, StimulusAttributes::class, get_debug_type($stimulusDto)));
-        }
-
-        $controllersAttributes = $stimulusDto->toArray();
-        $attributes = $this->attributes;
-
-        $attributes['data-controller'] = trim(implode(' ', array_merge(
-            explode(' ', $attributes['data-controller'] ?? ''),
-            explode(' ', $controllersAttributes['data-controller'] ?? [])
-        )));
-        unset($controllersAttributes['data-controller']);
-
-        $clone = new self($attributes, $this->escaper);
-
-        // add the remaining attributes for values/classes
-        return $clone->defaults($controllersAttributes);
-    }
-
     public function remove($key): self
     {
         $attributes = $this->attributes;

src/TwigComponent/src/ComponentTemplateFinder.php

@@ -11,58 +11,25 @@
 
 namespace Symfony\UX\TwigComponent;
 
-use Twig\Environment;
 use Twig\Loader\LoaderInterface;
 
 /**
  * @author Matheo Daninos <[email protected]>
  */
 final class ComponentTemplateFinder implements ComponentTemplateFinderInterface
 {
-    private readonly LoaderInterface $loader;
-
     public function __construct(
-        Environment|LoaderInterface $loader,
-        private readonly ?string $directory = null,
+        private readonly LoaderInterface $loader,
+        private readonly string $directory,
     ) {
-        if ($loader instanceof Environment) {
-            trigger_deprecation('symfony/ux-twig-component', '2.13', 'The "%s()" method will require "%s $loader" as first argument in 3.0. Passing an "Environment" instance is deprecated.', __METHOD__, LoaderInterface::class);
-            $loader = $loader->getLoader();
-        }
-        $this->loader = $loader;
-        if (null === $this->directory) {
-            trigger_deprecation('symfony/ux-twig-component', '2.13', 'The "%s()" method will require "string $directory" argument in 3.0. Not defining it or passing null is deprecated.', __METHOD__);
-        }
     }
 
     public function findAnonymousComponentTemplate(string $name): ?string
     {
-        $loader = $this->loader;
         $componentPath = rtrim(str_replace(':', '/', $name));
 
-        // Legacy auto-naming rules < 2.13
-        if (null === $this->directory) {
-            if ($loader->exists('components/'.$componentPath.'.html.twig')) {
-                return 'components/'.$componentPath.'.html.twig';
-            }
-
-            if ($loader->exists($componentPath.'.html.twig')) {
-                return $componentPath.'.html.twig';
-            }
-
-            if ($loader->exists('components/'.$componentPath)) {
-                return 'components/'.$componentPath;
-            }
-
-            if ($loader->exists($componentPath)) {
-                return $componentPath;
-            }
-
-            return null;
-        }
-
         $template = rtrim($this->directory, '/').'/'.$componentPath.'.html.twig';
-        if ($loader->exists($template)) {
+        if ($this->loader->exists($template)) {
             return $template;
         }
 
@@ -72,7 +39,7 @@ public function findAnonymousComponentTemplate(string $name): ?string
         }
 
         $template = '@'.$parts[0].'/components/'.$parts[1].'.html.twig';
-        if ($loader->exists($template)) {
+        if ($this->loader->exists($template)) {
             return $template;
         }
 

src/TwigComponent/src/DependencyInjection/Compiler/TwigComponentPass.php

@@ -35,8 +35,6 @@ public function process(ContainerBuilder $container): void
         $componentNames = [];
         $componentDefaults = $container->getParameter('ux.twig_component.component_defaults');
         $container->getParameterBag()->remove('ux.twig_component.component_defaults');
-        $legacyAutoNaming = $container->hasParameter('ux.twig_component.legacy_autonaming');
-        $container->getParameterBag()->remove('ux.twig_component.legacy_autonaming');
 
         foreach ($container->findTaggedServiceIds('twig.component') as $id => $tags) {
             $definition = $container->findDefinition($id);
@@ -48,17 +46,13 @@ public function process(ContainerBuilder $container): void
 
             foreach ($tags as $tag) {
                 if (!\array_key_exists('key', $tag)) {
-                    if ($legacyAutoNaming) {
-                        $name = substr($fqcn, strrpos($fqcn, '\\') + 1);
-                    } else {
-                        if (null === $defaults) {
-                            throw new LogicException(\sprintf('Could not generate a component name for class "%s": no matching namespace found under the "twig_component.defaults" to use as a root. Check the config or give your component an explicit name.', $fqcn));
-                        }
-
-                        $name = str_replace('\\', ':', substr($fqcn, \strlen($defaults['namespace'])));
-                        if ($defaults['name_prefix']) {
-                            $name = \sprintf('%s:%s', $defaults['name_prefix'], $name);
-                        }
+                    if (null === $defaults) {
+                        throw new LogicException(\sprintf('Could not generate a component name for class "%s": no matching namespace found under the "twig_component.defaults" to use as a root. Check the config or give your component an explicit name.', $fqcn));
+                    }
+
+                    $name = str_replace('\\', ':', substr($fqcn, \strlen($defaults['namespace'])));
+                    if ($defaults['name_prefix']) {
+                        $name = \sprintf('%s:%s', $defaults['name_prefix'], $name);
                     }
                     if (\in_array($name, $componentNames, true)) {
                         throw new LogicException(\sprintf('Failed creating the "%s" component with the automatic name "%s": another component already has this name. To fix this, give the component an explicit name (hint: using "%s" will override the existing component).', $fqcn, $name, $name));

src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php

@@ -49,8 +49,6 @@
  */
 final class TwigComponentExtension extends Extension implements ConfigurationInterface
 {
-    private const DEPRECATED_DEFAULT_KEY = '__deprecated__use_old_naming_behavior';
-
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
@@ -62,12 +60,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
         $defaults = $config['defaults'];
-        if ($defaults === [self::DEPRECATED_DEFAULT_KEY]) {
-            trigger_deprecation('symfony/ux-twig-component', '2.13', 'Not setting the "twig_component.defaults" config option is deprecated. Check the documentation for an example configuration.');
-            $container->setParameter('ux.twig_component.legacy_autonaming', true);
-
-            $defaults = [];
-        }
         $container->setParameter('ux.twig_component.component_defaults', $defaults);
 
         $container->register('ux.twig_component.component_template_finder', ComponentTemplateFinder::class)
@@ -147,9 +139,6 @@ static function (ChildDefinition $definition, AsTwigComponent $attribute) {
             ->addTag('console.command')
         ;
 
-        $container->setAlias('console.command.stimulus_component_debug', 'ux.twig_component.command.debug')
-            ->setDeprecated('symfony/ux-twig-component', '2.13', '%alias_id%');
-
         if ($container->getParameter('kernel.debug') && $config['profiler']) {
             $loader->load('debug.php');
         }
@@ -170,19 +159,9 @@ public function getConfigTreeBuilder(): TreeBuilder
         \assert($rootNode instanceof ArrayNodeDefinition);
 
         $rootNode
-            ->validate()
-            ->always(function ($v) {
-                if (!isset($v['anonymous_template_directory'])) {
-                    trigger_deprecation('symfony/twig-component-bundle', '2.13', 'Not setting the "twig_component.anonymous_template_directory" config option is deprecated. It will default to "components" in 3.0.');
-                    $v['anonymous_template_directory'] = null;
-                }
-
-                return $v;
-            })
-            ->end()
             ->children()
                 ->arrayNode('defaults')
-                    ->defaultValue([self::DEPRECATED_DEFAULT_KEY])
+                    ->isRequired()
                     ->useAttributeAsKey('namespace')
                     ->validate()
                         ->always(function ($v) {
@@ -213,16 +192,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
                 ->scalarNode('anonymous_template_directory')
+                    ->isRequired()
                     ->info('Defaults to `components`')
                 ->end()
                 ->booleanNode('profiler')
                     ->info('Enables the profiler for Twig Component (in debug mode)')
                     ->defaultValue('%kernel.debug%')
                 ->end()
-                ->scalarNode('controllers_json')
-                    ->setDeprecated('symfony/ux-twig-component', '2.18', 'The "twig_component.controllers_json" config option is deprecated, and will be removed in 3.0.')
-                    ->defaultNull()
-                ->end()
             ->end();
 
         return $treeBuilder;

src/TwigComponent/src/Event/PostMountEvent.php

@@ -19,31 +19,12 @@
  */
 final class PostMountEvent extends Event
 {
-    private ?ComponentMetadata $metadata;
-    private array $extraMetadata;
-
     public function __construct(
         private object $component,
         private array $data,
-        array|ComponentMetadata $metadata = [],
-        $extraMetadata = [],
+        private ?ComponentMetadata $metadata = null,
+        private array $extraMetadata = [],
     ) {
-        if (\is_array($metadata)) {
-            trigger_deprecation('symfony/ux-twig-component', '2.13', 'In TwigComponent 3.0, the third argument of "%s()" will be a "%s" object and the "$extraMetadata" array should be passed as the fourth argument.', __METHOD__, ComponentMetadata::class);
-
-            $this->metadata = null;
-            $this->extraMetadata = $metadata;
-        } else {
-            if (null !== $metadata && !$metadata instanceof ComponentMetadata) {
-                throw new \InvalidArgumentException(\sprintf('Expecting "$metadata" to be null or an instance of "%s", given: "%s."', ComponentMetadata::class, get_debug_type($metadata)));
-            }
-            if (!\is_array($extraMetadata)) {
-                throw new \InvalidArgumentException(\sprintf('Expecting "$extraMetadata" to be array, given: "%s".', get_debug_type($extraMetadata)));
-            }
-
-            $this->metadata = $metadata;
-            $this->extraMetadata = $extraMetadata;
-        }
     }
 
     public function getComponent(): object

src/TwigComponent/src/Event/PreMountEvent.php

@@ -19,11 +19,11 @@
  */
 final class PreMountEvent extends Event
 {
-    public function __construct(private object $component, private array $data, private readonly ?ComponentMetadata $metadata = null)
-    {
-        if (null === $this->metadata) {
-            trigger_deprecation('symfony/ux-twig-component', '2.13', 'In TwigComponent 3.0, "%s()" method will require a "%s $metadata" argument. Not passing it is deprecated.', __METHOD__, ComponentMetadata::class);
-        }
+    public function __construct(
+        private object $component,
+        private array $data,
+        private readonly ComponentMetadata $metadata,
+    ) {
     }
 
     public function getComponent(): object

src/TwigComponent/src/Twig/ComponentNode.php

@@ -51,15 +51,7 @@ public function compile(Compiler $compiler): void
 
         $useYield = method_exists(Environment::class, 'useYield') && $compiler->getEnvironment()->useYield();
 
-        // since twig/twig 3.9.0: Using the internal "twig_to_array" function is deprecated.
-        if (method_exists(CoreExtension::class, 'toArray')) {
-            $twig_to_array = 'Twig\Extension\CoreExtension::toArray';
-        } else {
-            $twig_to_array = 'twig_to_array';
-        }
-
         $componentRuntime = $compiler->getVarName();
-
         $compiler
                ->write(\sprintf('$%s = $this->env->getRuntime(', $componentRuntime))
                ->string(ComponentRuntime::class)
@@ -75,7 +67,7 @@ public function compile(Compiler $compiler): void
             ->write(\sprintf('$preRendered = $%s->preRender(', $componentRuntime))
             ->string($this->getAttribute('component'))
             ->raw(', ')
-            ->raw($twig_to_array)
+            ->raw('Twig\Extension\CoreExtension::toArray')
             ->raw('(');
         $this->writeProps($compiler)
             ->raw(')')
@@ -107,7 +99,7 @@ public function compile(Compiler $compiler): void
             ->write(\sprintf('$preRenderEvent = $%s->startEmbedComponent(', $componentRuntime))
             ->string($this->getAttribute('component'))
             ->raw(', ')
-            ->raw($twig_to_array)
+            ->raw('Twig\Extension\CoreExtension::toArray')
             ->raw('(');
         $this->writeProps($compiler)
             ->raw('), ')

src/TwigComponent/tests/Fixtures/Kernel.php

@@ -56,24 +56,20 @@ protected function configureContainer(ContainerConfigurator $c): void
         ]);
 
         $twigComponentConfig = [];
-        if ('legacy_autonaming' != $this->environment) {
-            $acmeDefaults = [
-                'name_prefix' => 'AcmePrefix',
-            ];
-            if ('no_template_directory' !== $this->environment) {
-                $acmeDefaults['template_directory'] = 'acme_components';
-            }
-            $twigComponentConfig['defaults'] = [
-                'Symfony\UX\TwigComponent\Tests\Fixtures\Component\\' => 'components/',
-                'Symfony\UX\TwigComponent\Tests\Fixtures\AcmeComponent\\' => $acmeDefaults,
-            ];
+        $acmeDefaults = [
+            'name_prefix' => 'AcmePrefix',
+        ];
+        if ('no_template_directory' !== $this->environment) {
+            $acmeDefaults['template_directory'] = 'acme_components';
         }
+        $twigComponentConfig['defaults'] = [
+            'Symfony\UX\TwigComponent\Tests\Fixtures\Component\\' => 'components/',
+            'Symfony\UX\TwigComponent\Tests\Fixtures\AcmeComponent\\' => $acmeDefaults,
+        ];
 
-        if ('legacy_anonymous' != $this->environment) {
-            $twigComponentConfig['anonymous_template_directory'] = 'components';
-            if ('anonymous_directory' == $this->environment) {
-                $twigComponentConfig['anonymous_template_directory'] = 'anonymous';
-            }
+        $twigComponentConfig['anonymous_template_directory'] = 'components';
+        if ('anonymous_directory' === $this->environment) {
+            $twigComponentConfig['anonymous_template_directory'] = 'anonymous';
         }
 
         $c->extension('twig_component', $twigComponentConfig);