ComponentTemplateFinderInterface to isolate logic

Author: matheo

src/TwigComponent/src/ComponentFactory.php

@@ -31,7 +31,7 @@ final class ComponentFactory
      * @param array<class-string, string> $classMap
      */
     public function __construct(
-        private Environment $environment,
+        private ComponentTemplateFinderInterface $componentTemplateFinder,
         private ServiceLocator $components,
         private PropertyAccessorInterface $propertyAccessor,
         private EventDispatcherInterface $eventDispatcher,
@@ -45,14 +45,14 @@ public function metadataFor(string $name): ComponentMetadata
         $name = $this->classMap[$name] ?? $name;
 
         if (!$config = $this->config[$name] ?? null) {
-            if (($template = $this->findAnonymousComponentTemplate($name)) !== null) {
+            if (($template = $this->componentTemplateFinder->findAnonymousComponentTemplate($name)) !== null) {
                 return new ComponentMetadata([
                     'key' => $name,
                     'template' => $template,
                 ]);
             }
 
-            throw new \InvalidArgumentException(sprintf('Unknown component "%s". The registered components are: %s. And no template anonymous component founded', $name, implode(', ', array_keys($this->config))));
+            $this->throwUnknownComponentException($name);
         }
 
         return new ComponentMetadata($config);
@@ -168,7 +168,7 @@ private function getComponent(string $name): object
                 return new AnonymousComponent();
             }
 
-            throw new \InvalidArgumentException(sprintf('Unknown component "%s". The registered components are: %s. And no anonymous component founded', $name, implode(', ', array_keys($this->components->getProvidedServices()))));
+            $this->throwUnknownComponentException($name);
         }
 
         return $this->components->get($name);
@@ -210,38 +210,14 @@ private function postMount(object $component, array $data): array
 
     private function isAnonymousComponent(string $name): bool
     {
-        return null !== $this->findAnonymousComponentTemplate($name);
-    }
-
-    public function findAnonymousComponentTemplate(string $name): ?string
-    {
-        $loader = $this->environment->getLoader();
-        $componentPath = rtrim(str_replace(':', '/', $name));
-
-        if ($loader->exists($componentPath)) {
-            return $componentPath;
-        }
-
-        if ($loader->exists($componentPath.'.html.twig')) {
-            return $componentPath.'.html.twig';
-        }
-
-        if ($loader->exists('components/'.$componentPath)) {
-            return 'components/'.$componentPath;
-        }
-
-        if ($loader->exists('/components/'.$componentPath.'.html.twig')) {
-            return '/components/'.$componentPath.'.html.twig';
-        }
-
-        return null;
+        return null !== $this->componentTemplateFinder->findAnonymousComponentTemplate($name);
     }
 
     /**
      * @return never
      */
     private function throwUnknownComponentException(string $name): void
     {
-        throw new \InvalidArgumentException(sprintf('Unknown component "%s". The registered components are: %s', $name, implode(', ', array_keys($this->config))));
+        throw new \InvalidArgumentException(sprintf('Unknown component "%s". The registered components are: %s. And no matching anonymous component template was found', $name, implode(', ', array_keys($this->config))));
     }
 }

src/TwigComponent/src/ComponentTemplateFinder.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\UX\TwigComponent;
+
+interface ComponentTemplateFinder
+{
+
+}

src/TwigComponent/src/ComponentTemplateFinderInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\UX\TwigComponent;
+
+interface ComponentTemplateFinderInterface
+{
+
+}

src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php

@@ -22,6 +22,8 @@
 use Symfony\UX\TwigComponent\ComponentRenderer;
 use Symfony\UX\TwigComponent\ComponentRendererInterface;
 use Symfony\UX\TwigComponent\ComponentStack;
+use Symfony\UX\TwigComponent\ComponentTemplateFinder;
+use Symfony\UX\TwigComponent\ComponentTemplateFinderInterface;
 use Symfony\UX\TwigComponent\DependencyInjection\Compiler\TwigComponentPass;
 use Symfony\UX\TwigComponent\Twig\ComponentExtension;
 use Symfony\UX\TwigComponent\Twig\ComponentLexer;
@@ -40,6 +42,14 @@ public function load(array $configs, ContainerBuilder $container): void
             throw new LogicException('The TwigBundle is not registered in your application. Try running "composer require symfony/twig-bundle".');
         }
 
+        $container->register('ux.twig_component.component_template_finder', ComponentTemplateFinder::class)
+            ->setArguments([
+                new Reference('twig')
+            ])
+        ;
+
+        $container->setAlias(ComponentRendererInterface::class, 'ux.twig_component.component_renderer');
+
         $container->registerAttributeForAutoconfiguration(
             AsTwigComponent::class,
             static function (ChildDefinition $definition, AsTwigComponent $attribute) {
@@ -49,7 +59,7 @@ static function (ChildDefinition $definition, AsTwigComponent $attribute) {
 
         $container->register('ux.twig_component.component_factory', ComponentFactory::class)
             ->setArguments([
-                new Reference('twig'),
+                new Reference('ux.twig_component.component_template_finder'),
                 class_exists(AbstractArgument::class) ? new AbstractArgument(sprintf('Added in %s.', TwigComponentPass::class)) : null,
                 new Reference('property_accessor'),
                 new Reference('event_dispatcher'),
@@ -69,7 +79,7 @@ class_exists(AbstractArgument::class) ? new AbstractArgument(sprintf('Added in %
             ])
         ;
 
-        $container->setAlias(ComponentRendererInterface::class, 'ux.twig_component.component_renderer');
+        $container->setAlias(ComponentTemplateFinderInterface::class, 'ux.twig_component.component_template_finder');
 
         $container->register('ux.twig_component.twig.component_extension', ComponentExtension::class)
             ->addTag('twig.extension')