[LiveComponent] Fix new URL calculation with LiveProp using Serializer (and Serializer attributes), and when using custom modifier

src/LiveComponent/src/DependencyInjection/LiveComponentExtension.php

@@ -141,6 +141,7 @@ function (ChildDefinition $definition, AsLiveComponent $attribute) {
         $container->register('ux.live_component.live_url_subscriber', LiveUrlSubscriber::class)
             ->setArguments([
                 new Reference('ux.live_component.metadata_factory'),
+                new Reference('ux.live_component.component_hydrator'),
                 new Reference('ux.live_component.url_factory'),
             ])
             ->addTag('kernel.event_subscriber')

src/LiveComponent/src/EventListener/LiveUrlSubscriber.php

@@ -12,11 +12,12 @@
 namespace Symfony\UX\LiveComponent\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\UX\LiveComponent\LiveComponentHydrator;
 use Symfony\UX\LiveComponent\Metadata\LiveComponentMetadataFactory;
 use Symfony\UX\LiveComponent\Util\UrlFactory;
+use Symfony\UX\TwigComponent\MountedComponent;
 
 /**
  * @internal
@@ -27,6 +28,7 @@ class LiveUrlSubscriber implements EventSubscriberInterface
 
     public function __construct(
         private LiveComponentMetadataFactory $metadataFactory,
+        private LiveComponentHydrator $liveComponentHydrator,
         private UrlFactory $urlFactory,
     ) {
     }
@@ -42,9 +44,14 @@ public function onKernelResponse(ResponseEvent $event): void
             return;
         }
 
+        if (!$request->attributes->has('_mounted_component')) {
+            return;
+        }
+
         $newLiveUrl = null;
         if ($previousLiveUrl = $request->headers->get(self::URL_HEADER)) {
-            $liveProps = $this->getLivePropsFromRequest($request);
+            $mounted = $request->attributes->get('_mounted_component');
+            $liveProps = $this->getLiveProps($mounted);
             $newLiveUrl = $this->urlFactory->createFromPreviousAndProps($previousLiveUrl, $liveProps['path'], $liveProps['query']);
         }
 
@@ -66,26 +73,26 @@ public static function getSubscribedEvents(): array
      *     query: array<string, mixed>
      * }
      */
-    private function getLivePropsFromRequest(Request $request): array
+    private function getLiveProps(MountedComponent $mounted): array
     {
-        $componentName = $request->attributes->get('_live_component');
-        $metadata = $this->metadataFactory->getMetadata($componentName);
-
-        $liveRequestData = $request->attributes->get('_live_request_data') ?? [];
-        $values = array_merge(
-            $liveRequestData['props'] ?? [],
-            $liveRequestData['updated'] ?? [],
-            $liveRequestData['responseProps'] ?? []
+        $metadata = $this->metadataFactory->getMetadata($mounted->getName());
+
+        $dehydratedProps = $this->liveComponentHydrator->dehydrate(
+            $mounted->getComponent(),
+            $mounted->getAttributes(),
+            $metadata
         );
 
+        $values = $dehydratedProps->getProps();
+
         $urlLiveProps = [
             'path' => [],
             'query' => [],
         ];
-        foreach ($metadata->getAllUrlMappings() as $name => $urlMapping) {
+
+        foreach ($metadata->getAllUrlMappings($mounted->getComponent()) as $name => $urlMapping) {
             if (isset($values[$name]) && $urlMapping) {
-                $urlLiveProps[$urlMapping->mapPath ? 'path' : 'query'][$urlMapping->as ?? $name] =
-                    $values[$name];
+                $urlLiveProps[$urlMapping->mapPath ? 'path' : 'query'][$urlMapping->as ?? $name] = $values[$name];
             }
         }
 

src/LiveComponent/src/Metadata/LiveComponentMetadata.php

@@ -69,10 +69,10 @@ public function getOnlyPropsThatAcceptUpdatesFromParent(array $inputProps): arra
     /**
      * @return UrlMapping[]
      */
-    public function getAllUrlMappings(): iterable
+    public function getAllUrlMappings(object $component): iterable
     {
         $urlMappings = [];
-        foreach ($this->livePropsMetadata as $livePropMetadata) {
+        foreach ($this->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($livePropMetadata->urlMapping()) {
                 $urlMappings[$livePropMetadata->getName()] = $livePropMetadata->urlMapping();
             }
@@ -81,7 +81,7 @@ public function getAllUrlMappings(): iterable
         return $urlMappings;
     }
 
-    public function hasQueryStringBindings($component): bool
+    public function hasQueryStringBindings(object $component): bool
     {
         foreach ($this->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($livePropMetadata->urlMapping()) {

src/LiveComponent/tests/Fixtures/Component/ComponentWithUrlBoundProps.php

@@ -12,6 +12,8 @@
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Component;
 
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 use Symfony\UX\LiveComponent\Metadata\UrlMapping;
@@ -37,6 +39,9 @@ class ComponentWithUrlBoundProps
     #[LiveProp(url: true)]
     public ?Address $objectProp = null;
 
+    #[LiveProp(url: true, useSerializerForHydration: true)]
+    public ?Address $objectPropWithSerializerForHydration = null;
+
     #[LiveProp(fieldName: 'field1', url: true)]
     public ?string $propWithField1 = null;
 
@@ -49,6 +54,19 @@ class ComponentWithUrlBoundProps
     #[LiveProp]
     public ?bool $maybeBoundPropInUrl = false;
 
+    #[LiveProp(url: new UrlMapping(as: 'p'), modifier: 'modifyPropertyWithModifierAndAlias')]
+    public ?string $propertyWithModifierAndAlias = null;
+
+    public function modifyPropertyWithModifierAndAlias(LiveProp $liveProp): LiveProp
+    {
+        $urlMapping = $liveProp->url();
+        if (!$urlMapping instanceof UrlMapping) {
+            return $liveProp;
+        }
+
+        return $liveProp->withUrl(new UrlMapping(as: 'alias_' . $urlMapping->as));
+    }
+
     public function getField2(): string
     {
         return 'field2';
@@ -83,5 +101,13 @@ public function modifyBoundPropWithCustomAlias(LiveProp $liveProp): LiveProp
         return $liveProp;
     }
 
+    #[LiveAction]
+    public function updateLiveProp(#[LiveArg] string $propName, #[LiveArg] mixed $propValue): void
+    {
+        if (!property_exists($this, $propName)) {
+            throw new \InvalidArgumentException(\sprintf('Property "%s" does not exist on component "%s".', $propName, static::class));
+        }
 
+        $this->{$propName} = $propValue;
+    }
 }

src/LiveComponent/tests/Fixtures/Dto/Address.php

@@ -2,8 +2,12 @@
 
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Dto;
 
+use Symfony\Component\Serializer\Attribute\SerializedName;
+
 class Address
 {
     public string $address;
+
+    #[SerializedName(serializedName: 'c')]
     public string $city;
-}
+}

src/LiveComponent/tests/Functional/EventListener/AddLiveAttributesSubscriberTest.php

@@ -141,6 +141,8 @@ public function testQueryStringMappingAttribute()
             'boundPropWithCustomAlias' => ['name' => 'customAlias'],
             'pathProp' => ['name' => 'pathProp'],
             'pathPropWithAlias' => ['name' => 'pathAlias'],
+            'objectPropWithSerializerForHydration' => ['name' => 'objectPropWithSerializerForHydration'],
+            'propertyWithModifierAndAlias' => ['name' => 'alias_p'],
         ];
 
         $this->assertEquals($expected, $queryMapping);

src/LiveComponent/tests/Functional/EventListener/LiveUrlSubscriberTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\LiveComponent\Tests\Functional\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\UX\LiveComponent\Tests\Fixtures\Dto\Address;
 use Symfony\UX\LiveComponent\Tests\LiveComponentTestHelper;
 use Zenstruck\Browser\Test\HasBrowser;
 
@@ -26,17 +27,20 @@ public function getTestData(): iterable
             'previousLocation' => null,
             'expectedLocation' => null,
             'props' => [],
+            'args' => [],
         ];
         yield 'unknown_previous_location' => [
             'previousLocation' => 'foo/bar',
             'expectedLocation' => null,
             'props' => [],
+            'args' => [],
         ];
 
         yield 'no_prop' => [
             'previousLocation' => '/route_with_prop/foo',
             'expectedLocation' => null,
             'props' => [],
+            'args' => [],
         ];
 
         yield 'no_change' => [
@@ -45,52 +49,118 @@ public function getTestData(): iterable
             'props' => [
                 'pathProp' => 'foo',
             ],
+            'args' => [],
         ];
 
-        yield 'prop_changed' => [
+        yield 'path_prop_changed' => [
             'previousLocation' => '/route_with_prop/foo',
             'expectedLocation' => '/route_with_prop/bar',
             'props' => [
                 'pathProp' => 'foo',
             ],
-            'updated' => [
-                'pathProp' => 'bar',
+            'args' => [
+                'propName' => 'pathProp',
+                'propValue' => 'bar',
             ],
         ];
 
-        yield 'alias_prop_changed' => [
+        yield 'path_alias_prop_changed' => [
             'previousLocation' => '/route_with_alias_prop/foo',
             'expectedLocation' => '/route_with_alias_prop/bar',
             'props' => [
                 'pathPropWithAlias' => 'foo',
             ],
-            'updated' => [
-                'pathPropWithAlias' => 'bar',
+            'args' => [
+                'propName' => 'pathPropWithAlias',
+                'propValue' => 'bar',
             ],
         ];
+
+        yield 'query_alias_prop_changed' => [
+            'previousLocation' => '/',
+            'expectedLocation' => '/?q=search%2Bterm',
+            'props' => [],
+            'args' => [
+                'propName' => 'boundPropWithAlias',
+                'propValue' => 'search+term',
+            ],
+        ];
+
+        yield 'path_and_query_alias_prop_changed' => [
+            'previousLocation' => '/route_with_prop/foo',
+            'expectedLocation' => '/route_with_prop/baz?q=foo+bar',
+            'props' => [
+                'pathProp' => 'baz',
+            ],
+            'args' => [
+                'propName' => 'boundPropWithAlias',
+                'propValue' => 'foo bar',
+            ],
+        ];
+
+        $address = new Address();
+        $address->address = '123 Main St';
+        $address->city = 'Anytown';
+        yield 'with an object in query, keys "address" and "city" must be present' => [
+            'previousLocation' => '/',
+            'expectedLocation' => '/?objectProp%5Baddress%5D=123+Main+St&objectProp%5Bcity%5D=Anytown&q=search',
+            'props' => [
+                'objectProp' => $address,
+            ],
+            'args' => [
+                'propName' => 'boundPropWithAlias',
+                'propValue' => 'search',
+            ],
+        ];
+
+        $address = new Address();
+        $address->address = '123 Main St';
+        $address->city = 'Anytown';
+        yield 'with an object in query, with "useSerializerForHydration: true", keys "address" and "c" must be present' => [
+            'previousLocation' => '/',
+            'expectedLocation' => '/?intProp=3&objectPropWithSerializerForHydration%5Baddress%5D=123+Main+St&objectPropWithSerializerForHydration%5Bc%5D=Anytown',
+            'props' => [
+                'objectPropWithSerializerForHydration' => $address,
+            ],
+            'args' => [
+                'propName' => 'intProp',
+                'propValue' => '3',
+            ],
+        ];
+
+        yield 'query with alias ("p") and modifier (prefix by "alias_")' => [
+            'previousLocation' => '/',
+            'expectedLocation' => '/?alias_p=test',
+            'props' => [
+                'propertyWithModifierAndAlias' => 'test',
+            ],
+            'args' => [],
+        ];
     }
 
     /**
      * @dataProvider getTestData
      */
-    public function testNoHeader(
+    public function testNewLiveUrlAfterLiveAction(
         ?string $previousLocation,
         ?string $expectedLocation,
         array $props,
-        array $updated = [],
+        array $args,
     ): void {
         $component = $this->mountComponent('component_with_url_bound_props', $props);
         $dehydrated = $this->dehydrateComponent($component);
 
         $this->browser()
             ->throwExceptions()
             ->post(
-                '/_components/component_with_url_bound_props',
+                [] === $args
+                    ? '/_components/component_with_url_bound_props'
+                    : '/_components/component_with_url_bound_props/updateLiveProp',
                 [
                     'body' => [
                         'data' => json_encode([
                             'props' => $dehydrated->getProps(),
-                            'updated' => $updated,
+                            'args' => $args,
                         ]),
                     ],
                     'headers' => [