[LiveComponent] Fix new URL calculation when having #[LiveProp] with custom modifier which returns a new LiveProp

Author: Kocal

src/LiveComponent/src/EventListener/LiveUrlSubscriber.php

@@ -90,7 +90,7 @@ private function getLiveProps(MountedComponent $mounted): array
             '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];
             }

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

@@ -54,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';

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

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

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

@@ -112,6 +112,7 @@ public function getTestData(): iterable
                 'propValue' => 'search',
             ],
         ];
+
         $address = new Address();
         $address->address = '123 Main St';
         $address->city = 'Anytown';
@@ -126,6 +127,15 @@ public function getTestData(): iterable
                 'propValue' => '3',
             ],
         ];
+
+        yield 'query with alias ("p") and modifier (prefix by "alias_")' => [
+            'previousLocation' => '/',
+            'expectedLocation' => '/?alias_p=test',
+            'props' => [
+                'propertyWithModifierAndAlias' => 'test',
+            ],
+            'args' => [],
+        ];
     }
 
     /**

src/LiveComponent/tests/Unit/Metadata/LiveComponentMetadataTest.php

@@ -48,7 +48,7 @@ public function testGetAllUrlMappings()
             new LivePropMetadata('aliasUrlMapping', new LiveProp(url: $aliasUrlMapping), null, false, false, null),
         ];
         $liveComponentMetadata = new LiveComponentMetadata(new ComponentMetadata([]), $propMetadas);
-        $urlMappings = $liveComponentMetadata->getAllUrlMappings();
+        $urlMappings = $liveComponentMetadata->getAllUrlMappings(new \stdClass());
         $this->assertCount(2, $urlMappings);
         $this->assertInstanceOf(UrlMapping::class, $urlMappings['basicUrlMapping']);
         $this->assertEquals($aliasUrlMapping, $urlMappings['aliasUrlMapping']);