QueryStringPropsExtractor, renamed to UrlPropsExtractor shall get props from path also

Author: mbuliard

src/LiveComponent/src/DependencyInjection/LiveComponentExtension.php

@@ -51,7 +51,7 @@
 use Symfony\UX\LiveComponent\Util\FingerprintCalculator;
 use Symfony\UX\LiveComponent\Util\LiveComponentStack;
 use Symfony\UX\LiveComponent\Util\LiveControllerAttributesCreator;
-use Symfony\UX\LiveComponent\Util\QueryStringPropsExtractor;
+use Symfony\UX\LiveComponent\Util\UrlPropsExtractor;
 use Symfony\UX\LiveComponent\Util\TwigAttributeHelperFactory;
 use Symfony\UX\TwigComponent\ComponentFactory;
 use Symfony\UX\TwigComponent\ComponentRenderer;
@@ -231,7 +231,7 @@ function (ChildDefinition $definition, AsLiveComponent $attribute) {
             ->addTag('container.service_subscriber', ['key' => LiveControllerAttributesCreator::class, 'id' => 'ux.live_component.live_controller_attributes_creator'])
         ;
 
-        $container->register('ux.live_component.query_string_props_extractor', QueryStringPropsExtractor::class)
+        $container->register('ux.live_component.query_string_props_extractor', UrlPropsExtractor::class)
             ->setArguments([
                 new Reference('ux.live_component.component_hydrator'),
             ]);

src/LiveComponent/src/EventListener/QueryStringInitializeSubscriber.php

@@ -16,7 +16,7 @@
 use Symfony\Component\PropertyAccess\Exception\ExceptionInterface as PropertyAccessExceptionInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\UX\LiveComponent\Metadata\LiveComponentMetadataFactory;
-use Symfony\UX\LiveComponent\Util\QueryStringPropsExtractor;
+use Symfony\UX\LiveComponent\Util\UrlPropsExtractor;
 use Symfony\UX\TwigComponent\Event\PostMountEvent;
 
 /**
@@ -27,10 +27,10 @@
 class QueryStringInitializeSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly RequestStack $requestStack,
+        private readonly RequestStack                 $requestStack,
         private readonly LiveComponentMetadataFactory $metadataFactory,
-        private readonly QueryStringPropsExtractor $queryStringPropsExtractor,
-        private readonly PropertyAccessorInterface $propertyAccessor,
+        private readonly UrlPropsExtractor            $queryStringPropsExtractor,
+        private readonly PropertyAccessorInterface    $propertyAccessor,
     ) {
     }
 

src/LiveComponent/src/Util/QueryStringPropsExtractor.php renamed to src/LiveComponent/src/Util/UrlPropsExtractor.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\LiveComponent\Util;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\UX\LiveComponent\Exception\HydrationException;
 use Symfony\UX\LiveComponent\LiveComponentHydrator;
 use Symfony\UX\LiveComponent\Metadata\LiveComponentMetadata;
@@ -22,28 +23,29 @@
  *
  * @internal
  */
-final class QueryStringPropsExtractor
+final class UrlPropsExtractor
 {
     public function __construct(private readonly LiveComponentHydrator $hydrator)
     {
     }
 
     /**
-     * Extracts relevant query parameters from the current URL and hydrates them.
+     * Extracts relevant props parameters from the current URL and hydrates them.
      */
     public function extract(Request $request, LiveComponentMetadata $metadata, object $component): array
     {
-        $query = $request->query->all();
+        $parameters = array_merge($request->attributes->all(), $request->query->all());
 
-        if (empty($query)) {
+        //@todo never empty because custom values prefixed with _ ... do something ?
+        if (empty($parameters)) {
             return [];
         }
         $data = [];
 
         foreach ($metadata->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($queryMapping = $livePropMetadata->urlMapping()) {
                 $frontendName = $livePropMetadata->calculateFieldName($component, $livePropMetadata->getName());
-                if (null !== ($value = $query[$queryMapping->as ?? $frontendName] ?? null)) {
+                if (null !== ($value = $parameters[$queryMapping->as ?? $frontendName] ?? null)) {
                     if ('' === $value && null !== $livePropMetadata->getType() && (!$livePropMetadata->isBuiltIn() || 'array' === $livePropMetadata->getType())) {
                         // Cast empty string to empty array for objects and arrays
                         $value = [];

src/LiveComponent/tests/Functional/Util/QueryStringPropsExtractorTest.php renamed to src/LiveComponent/tests/Functional/Util/UrlPropsExtractorTest.php

@@ -16,9 +16,9 @@
 use Symfony\UX\LiveComponent\Metadata\LiveComponentMetadataFactory;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Dto\Address;
 use Symfony\UX\LiveComponent\Tests\LiveComponentTestHelper;
-use Symfony\UX\LiveComponent\Util\QueryStringPropsExtractor;
+use Symfony\UX\LiveComponent\Util\UrlPropsExtractor;
 
-class QueryStringPropsExtractorTest extends KernelTestCase
+class UrlPropsExtractorTest extends KernelTestCase
 {
     use LiveComponentTestHelper;
 
@@ -27,7 +27,7 @@ class QueryStringPropsExtractorTest extends KernelTestCase
      */
     public function testExtract(string $queryString, array $expected)
     {
-        $extractor = new QueryStringPropsExtractor($this->hydrator());
+        $extractor = new UrlPropsExtractor($this->hydrator());
 
         $request = Request::create('/'.!empty($queryString) ? '?'.$queryString : '');