Cath MethodNotAllowedException

Author: smnandre

src/LiveComponent/src/EventListener/LiveUrlSubscriber.php

@@ -45,11 +45,6 @@ public function onKernelResponse(ResponseEvent $event): void
         $newLiveUrl = null;
         if ($previousLiveUrl = $request->headers->get(self::URL_HEADER)) {
             $liveProps = $this->getLivePropsFromRequest($request);
-            if ([] === $liveProps['path'] && [] === $liveProps['query']) {
-                // If there are no live props, we don't need to change the URL
-                return;
-            }
-
             $newLiveUrl = $this->urlFactory->createFromPreviousAndProps($previousLiveUrl, $liveProps['path'], $liveProps['query']);
         }
 

src/LiveComponent/src/Util/UrlFactory.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\UX\LiveComponent\Util;
 
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
@@ -44,7 +44,7 @@ public function createFromPreviousAndProps(
 
         try {
             $newUrl = $this->createPath($previousUrl, $pathMappedProps);
-        } catch (ResourceNotFoundException|MissingMandatoryParametersException) {
+        } catch (ResourceNotFoundException|MethodNotAllowedException|MissingMandatoryParametersException) {
             return null;
         }
 
@@ -60,22 +60,10 @@ public function createFromPreviousAndProps(
 
     private function createPath(string $previousUrl, array $props): string
     {
-        // LiveComponent uses POST requests by default but previousUrl might only match a GET route.
-        $ret = $this->router->getContext();
-        $this->router->setContext(RequestContext::fromUri($previousUrl));
-        try {
-            $route = $this->router->match($previousUrl);
-        } catch (\Exception $e) {
-            return $previousUrl;
-        } finally {
-            $this->router->setContext($ret);
-        }
-
-        if (!isset($route['_route']) || '' === $route['_route']) {
-            return $previousUrl;
-        }
-
-        return $this->router->generate($route['_route'] ?? '', $props);
+        return $this->router->generate(
+            $this->router->match($previousUrl)['_route'] ?? '',
+            $props
+        );
     }
 
     private function replaceQueryString($url, array $props): string

src/LiveComponent/tests/Unit/Util/UrlFactoryTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\LiveComponent\Tests\Unit\Util;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouterInterface;
@@ -140,6 +141,19 @@ public function testResourceNotFoundException()
         $this->assertNull($factory->createFromPreviousAndProps($previousUrl, [], []));
     }
 
+    public function testMethodNotAllowedException()
+    {
+        $previousUrl = '/foo/bar';
+        $router = $this->createMock(RouterInterface::class);
+        $router->expects(self::once())
+            ->method('match')
+            ->with($previousUrl)
+            ->willThrowException(new MethodNotAllowedException(['GET']));
+        $factory = new UrlFactory($router);
+
+        $this->assertNull($factory->createFromPreviousAndProps($previousUrl, [], []));
+    }
+
     public function testMissingMandatoryParametersException()
     {
         $previousUrl = '/foo/bar';