symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+16Lines changed: 16 additions & 0 deletions
@@ -163,13 +163,17 @@ public function __invoke(Request $request): Response
         $p = $request->attributes->get('_route_params', []);
 
         if (\array_key_exists('route', $p)) {
+            if (\array_key_exists('path', $p)) {
+                throw new \RuntimeException(sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));
+            }
+
             return $this->redirectAction($request, $p['route'], $p['permanent'] ?? false, $p['ignoreAttributes'] ?? false, $p['keepRequestMethod'] ?? false, $p['keepQueryParams'] ?? false);
         }
 
         if (\array_key_exists('path', $p)) {
             return $this->urlRedirectAction($request, $p['path'], $p['permanent'] ?? false, $p['scheme'] ?? null, $p['httpPort'] ?? null, $p['httpsPort'] ?? null, $p['keepRequestMethod'] ?? false);
         }
 
-        throw new \RuntimeException('The parameter "path" or "route" is required to configure the redirect action.');
+        throw new \RuntimeException(sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));
     }
 }
@@ -335,6 +335,22 @@ public function testRedirectWithQueryWithRouteParamsOveriding()
         $this->assertRedirectUrl($controller($request), '/test?base=zouzou');
     }
 
+    public function testMissingPathOrRouteParameter()
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('The parameter "path" or "route" is required to configure the redirect action in "_redirect" routing configuration.');
+
+        (new RedirectController())(new Request([], [], ['_route' => '_redirect']));
+    }
+
+    public function testAmbiguousPathAndRouteParameter()
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "/foo" and "bar" found respectively in "_redirect" routing configuration.');
+
+        (new RedirectController())(new Request([], [], ['_route' => '_redirect', '_route_params' => ['path' => '/foo', 'route' => 'bar']]));
+    }
+
     private function createRequestObject($scheme, $host, $port, $baseUrl, $queryString = '')
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,17 @@ public function __invoke(Request $request): Response`
`163`	`163`	`$p = $request->attributes->get('_route_params', []);`
`164`	`164`
`165`	`165`	`if (\array_key_exists('route', $p)) {`
	`166`	`+ if (\array_key_exists('path', $p)) {`
	`167`	`+ throw new \RuntimeException(sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));`
	`168`	`+ }`
	`169`	`+`
`166`	`170`	`return $this->redirectAction($request, $p['route'], $p['permanent'] ?? false, $p['ignoreAttributes'] ?? false, $p['keepRequestMethod'] ?? false, $p['keepQueryParams'] ?? false);`
`167`	`171`	`}`
`168`	`172`
`169`	`173`	`if (\array_key_exists('path', $p)) {`
`170`	`174`	`return $this->urlRedirectAction($request, $p['path'], $p['permanent'] ?? false, $p['scheme'] ?? null, $p['httpPort'] ?? null, $p['httpsPort'] ?? null, $p['keepRequestMethod'] ?? false);`
`171`	`175`	`}`
`172`	`176`
`173`		`- throw new \RuntimeException('The parameter "path" or "route" is required to configure the redirect action.');`
	`177`	`+ throw new \RuntimeException(sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));`
`174`	`178`	`}`
`175`	`179`	`}`