returns

Author: mbuliard

src/LiveComponent/src/EventListener/LiveUrlSubscriber.php

@@ -36,19 +36,20 @@ public function onKernelResponse(ResponseEvent $event): void
         if (!$event->isMainRequest()) {
             return;
         }
+
         $request = $event->getRequest();
         if (!$request->attributes->has('_live_component')) {
             return;
         }
 
-        $newUrl = null;
-        if ($previousLocation = $request->headers->get(self::URL_HEADER)) {
-            $liveProps = $this->getLivePropsToMap($request);
-            $newUrl = $this->urlFactory->createFromPreviousAndProps($previousLocation, $liveProps['path'], $liveProps['query']);
+        $newLiveUrl = null;
+        if ($previousLiveUrl = $request->headers->get(self::URL_HEADER)) {
+            $liveProps = $this->getLivePropsFromRequest($request);
+            $newLiveUrl = $this->urlFactory->createFromPreviousAndProps($previousLiveUrl, $liveProps['path'], $liveProps['query']);
         }
 
-        if ($newUrl) {
-            $event->getResponse()->headers->set(self::URL_HEADER, $newUrl);
+        if ($newLiveUrl) {
+            $event->getResponse()->headers->set(self::URL_HEADER, $newLiveUrl);
         }
     }
 
@@ -59,7 +60,13 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    private function getLivePropsToMap(Request $request): array
+    /**
+     * @return array{
+     *     path: array<string, mixed>,
+     *     query: array<string, mixed>
+     * }
+     */
+    private function getLivePropsFromRequest(Request $request): array
     {
         $componentName = $request->attributes->get('_live_component');
         $metadata = $this->metadataFactory->getMetadata($componentName);