[Live] refactor AddLiveAttributesSubscriber

Author: kbond

src/LiveComponent/src/DependencyInjection/LiveComponentExtension.php

@@ -16,8 +16,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\ComponentValidator;
 use Symfony\UX\LiveComponent\ComponentValidatorInterface;
@@ -71,7 +69,7 @@ function (ChildDefinition $definition, AsLiveComponent $attribute) {
             ->addTag('container.service_subscriber', ['key' => ComponentFactory::class, 'id' => 'ux.twig_component.component_factory'])
             ->addTag('container.service_subscriber', ['key' => ComponentRenderer::class, 'id' => 'ux.twig_component.component_renderer'])
             ->addTag('container.service_subscriber', ['key' => LiveComponentHydrator::class, 'id' => 'ux.live_component.component_hydrator'])
-            ->addTag('container.service_subscriber')
+            ->addTag('container.service_subscriber') // csrf
         ;
 
         $container->register('ux.live_component.twig.component_extension', LiveComponentTwigExtension::class)
@@ -80,11 +78,9 @@ function (ChildDefinition $definition, AsLiveComponent $attribute) {
 
         $container->register('ux.live_component.twig.component_runtime', LiveComponentRuntime::class)
             ->setArguments([
-                new Reference('twig'),
                 new Reference('ux.live_component.component_hydrator'),
                 new Reference('ux.twig_component.component_factory'),
-                new Reference(UrlGeneratorInterface::class),
-                new Reference(CsrfTokenManagerInterface::class, ContainerBuilder::NULL_ON_INVALID_REFERENCE),
+                new Reference('router'),
             ])
             ->addTag('twig.runtime')
         ;
@@ -95,7 +91,8 @@ function (ChildDefinition $definition, AsLiveComponent $attribute) {
 
         $container->register('ux.live_component.add_attributes_subscriber', AddLiveAttributesSubscriber::class)
             ->addTag('kernel.event_subscriber')
-            ->addTag('container.service_subscriber', ['key' => LiveComponentRuntime::class, 'id' => 'ux.live_component.twig.component_runtime'])
+            ->addTag('container.service_subscriber', ['key' => LiveComponentHydrator::class, 'id' => 'ux.live_component.component_hydrator'])
+            ->addTag('container.service_subscriber') // csrf, twig & router
         ;
 
         $container->setAlias(ComponentValidatorInterface::class, ComponentValidator::class);

src/LiveComponent/src/EventListener/AddLiveAttributesSubscriber.php

@@ -4,10 +4,14 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
-use Symfony\UX\LiveComponent\Twig\LiveComponentRuntime;
+use Symfony\UX\LiveComponent\LiveComponentHydrator;
 use Symfony\UX\TwigComponent\ComponentAttributes;
+use Symfony\UX\TwigComponent\ComponentMetadata;
 use Symfony\UX\TwigComponent\EventListener\PreRenderEvent;
+use Twig\Environment;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -25,11 +29,7 @@ public function onPreRender(PreRenderEvent $event): void
             return;
         }
 
-        /** @var ComponentAttributes $attributes */
-        $attributes = $this->container->get(LiveComponentRuntime::class)
-            ->getLiveAttributes($event->getComponent(), $event->getMetadata())
-        ;
-
+        $attributes = $this->getLiveAttributes($event->getComponent(), $event->getMetadata());
         $variables = $event->getVariables();
 
         if (isset($variables['attributes']) && $variables['attributes'] instanceof ComponentAttributes) {
@@ -50,7 +50,33 @@ public static function getSubscribedEvents(): array
     public static function getSubscribedServices(): array
     {
         return [
-            LiveComponentRuntime::class,
+            LiveComponentHydrator::class,
+            UrlGeneratorInterface::class,
+            Environment::class,
+            '?'.CsrfTokenManagerInterface::class,
         ];
     }
+
+    private function getLiveAttributes(object $component, ComponentMetadata $metadata): ComponentAttributes
+    {
+        $url = $this->container->get(UrlGeneratorInterface::class)
+            ->generate('live_component', ['component' => $metadata->getName()])
+        ;
+        $data = $this->container->get(LiveComponentHydrator::class)->dehydrate($component);
+        $twig = $this->container->get(Environment::class);
+
+        $attributes = [
+            'data-controller' => 'live',
+            'data-live-url-value' => twig_escape_filter($twig, $url, 'html_attr'),
+            'data-live-data-value' => twig_escape_filter($twig, json_encode($data, \JSON_THROW_ON_ERROR), 'html_attr'),
+        ];
+
+        if ($this->container->has(CsrfTokenManagerInterface::class)) {
+            $attributes['data-live-csrf-value'] = $this->container->get(CsrfTokenManagerInterface::class)
+                ->getToken($metadata->getName())->getValue()
+            ;
+        }
+
+        return new ComponentAttributes($attributes);
+    }
 }

src/LiveComponent/src/Twig/LiveComponentRuntime.php

@@ -12,12 +12,8 @@
 namespace Symfony\UX\LiveComponent\Twig;
 
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\UX\LiveComponent\LiveComponentHydrator;
-use Symfony\UX\TwigComponent\ComponentAttributes;
 use Symfony\UX\TwigComponent\ComponentFactory;
-use Symfony\UX\TwigComponent\ComponentMetadata;
-use Twig\Environment;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -27,11 +23,9 @@
 final class LiveComponentRuntime
 {
     public function __construct(
-        private Environment $twig,
         private LiveComponentHydrator $hydrator,
         private ComponentFactory $factory,
         private UrlGeneratorInterface $urlGenerator,
-        private ?CsrfTokenManagerInterface $csrfTokenManager = null
     ) {
     }
 
@@ -42,22 +36,4 @@ public function getComponentUrl(string $name, array $props = []): string
 
         return $this->urlGenerator->generate('live_component', $params);
     }
-
-    public function getLiveAttributes(object $component, ComponentMetadata $metadata): ComponentAttributes
-    {
-        $url = $this->urlGenerator->generate('live_component', ['component' => $metadata->getName()]);
-        $data = $this->hydrator->dehydrate($component);
-
-        $attributes = [
-            'data-controller' => 'live',
-            'data-live-url-value' => twig_escape_filter($this->twig, $url, 'html_attr'),
-            'data-live-data-value' => twig_escape_filter($this->twig, json_encode($data, \JSON_THROW_ON_ERROR), 'html_attr'),
-        ];
-
-        if ($this->csrfTokenManager) {
-            $attributes['data-live-csrf-value'] = $this->csrfTokenManager->getToken($metadata->getName())->getValue();
-        }
-
-        return new ComponentAttributes($attributes);
-    }
 }