[FrameworkBundle] Improve DX of RedirectController

dunglas · dunglas · commit 349cd9217968 · 2017-12-01T20:38:43.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -146,4 +146,13 @@ public function urlRedirectAction(Request $request, string $path, bool $permanen
 
         return new RedirectResponse($url, $statusCode);
     }
+
+    public function __invoke(Request $request): Response
+    {
+        if ($route = $request->attributes->get('route')) {
+            return $this->redirectAction($request, $route, $request->attributes->getBoolean('permanent', false), $request->attributes->get('ignoreAttributes', false));
+        }
+
+        return $this->urlRedirectAction($request, $request->attributes->get('path'), $request->attributes->getBoolean('permanent', false), $request->attributes->get('scheme'), $request->attributes->getInt('httpPort'), $request->attributes->getInt('httpsPort'));
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -42,6 +42,20 @@ public function testEmptyRoute()
         } catch (HttpException $e) {
             $this->assertSame(404, $e->getStatusCode());
         }
+
+        try {
+            $controller->redirectAction($request, '', true);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(410, $e->getStatusCode());
+        }
+
+        try {
+            $controller($request, '', false);
+            $this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
+        } catch (HttpException $e) {
+            $this->assertSame(404, $e->getStatusCode());
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,13 @@ public function urlRedirectAction(Request $request, string $path, bool $permanen`
`146`	`146`
`147`	`147`	`return new RedirectResponse($url, $statusCode);`
`148`	`148`	`}`
	`149`	`+`
	`150`	`+ public function __invoke(Request $request): Response`
	`151`	`+ {`
	`152`	`+ if ($route = $request->attributes->get('route')) {`
	`153`	`+ return $this->redirectAction($request, $route, $request->attributes->getBoolean('permanent', false), $request->attributes->get('ignoreAttributes', false));`
	`154`	`+ }`
	`155`	`+`
	`156`	`+ return $this->urlRedirectAction($request, $request->attributes->get('path'), $request->attributes->getBoolean('permanent', false), $request->attributes->get('scheme'), $request->attributes->getInt('httpPort'), $request->attributes->getInt('httpsPort'));`
	`157`	`+ }`
`149`	`158`	`}`