Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] Add support to 307/308 HTTP status codes in RedirectController #26213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[FrameworkBundle] Add support to 307/308 HTTP status codes in RedirectController #26213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4265fb
Issue #26171 - allow to use 307/308 HTTP response codes
ZipoKing Feb 18, 2018
b955a6f
Changelog update, remove deprecation notes
ZipoKing Feb 18, 2018
6aad61c
fabbot-guided changes
ZipoKing Feb 18, 2018
103c122
Use direct HTTP status codes instead of constants
ZipoKing Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use direct HTTP status codes instead of constants
  • Loading branch information
@ZipoKing
ZipoKing committed Feb 18, 2018
commit 103c1227949112ab45183f151f0449a8096fa30a
12 changes: 6 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function __construct(UrlGeneratorInterface $router = null, int $httpPort
public function redirectAction(Request $request, string $route, bool $permanent = false, $ignoreAttributes = false, bool $keepRequestMethod = false): Response
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for other reviewers: the class is final, so this is not a BC break

{
if ('' == $route) {
throw new HttpException($permanent ? Response::HTTP_GONE : Response::HTTP_NOT_FOUND);
throw new HttpException($permanent ? 410 : 404);
}

$attributes = array();
Expand All @@ -70,9 +70,9 @@ public function redirectAction(Request $request, string $route, bool $permanent
}

if ($keepRequestMethod) {
$statusCode = $permanent ? Response::HTTP_PERMANENTLY_REDIRECT : Response::HTTP_TEMPORARY_REDIRECT;
$statusCode = $permanent ? 308 : 307;
} else {
$statusCode = $permanent ? Response::HTTP_MOVED_PERMANENTLY : Response::HTTP_FOUND;
$statusCode = $permanent ? 301 : 302;
}

return new RedirectResponse($this->router->generate($route, $attributes, UrlGeneratorInterface::ABSOLUTE_URL), $statusCode);
Expand Down Expand Up @@ -100,13 +100,13 @@ public function redirectAction(Request $request, string $route, bool $permanent
public function urlRedirectAction(Request $request, string $path, bool $permanent = false, string $scheme = null, int $httpPort = null, int $httpsPort = null, bool $keepRequestMethod = false): Response
{
if ('' == $path) {
throw new HttpException($permanent ? Response::HTTP_GONE : Response::HTTP_NOT_FOUND);
throw new HttpException($permanent ? 410 : 404);
}

if ($keepRequestMethod) {
$statusCode = $permanent ? Response::HTTP_PERMANENTLY_REDIRECT : Response::HTTP_TEMPORARY_REDIRECT;
$statusCode = $permanent ? 308 : 307;
} else {
$statusCode = $permanent ? Response::HTTP_MOVED_PERMANENTLY : Response::HTTP_FOUND;
$statusCode = $permanent ? 301 : 302;
}

// redirect if the path is a full URL
Expand Down
28 changes: 14 additions & 14 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public function testEmptyRoute()
$controller->redirectAction($request, '', true);
$this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
} catch (HttpException $e) {
$this->assertSame(Response::HTTP_GONE, $e->getStatusCode());
$this->assertSame(410, $e->getStatusCode());
}

try {
$controller->redirectAction($request, '', false);
$this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
} catch (HttpException $e) {
$this->assertSame(Response::HTTP_NOT_FOUND, $e->getStatusCode());
$this->assertSame(404, $e->getStatusCode());
}
}

Expand Down Expand Up @@ -86,14 +86,14 @@ public function testRoute($permanent, $keepRequestMethod, $ignoreAttributes, $ex
public function provider()
{
return array(
array(true, false, false, Response::HTTP_MOVED_PERMANENTLY, array('additional-parameter' => 'value')),
array(false, false, false, Response::HTTP_FOUND, array('additional-parameter' => 'value')),
array(false, false, true, Response::HTTP_FOUND, array()),
array(false, false, array('additional-parameter'), Response::HTTP_FOUND, array()),
array(true, true, false, Response::HTTP_PERMANENTLY_REDIRECT, array('additional-parameter' => 'value')),
array(false, true, false, Response::HTTP_TEMPORARY_REDIRECT, array('additional-parameter' => 'value')),
array(false, true, true, Response::HTTP_TEMPORARY_REDIRECT, array()),
array(false, true, array('additional-parameter'), Response::HTTP_TEMPORARY_REDIRECT, array()),
array(true, false, false, 301, array('additional-parameter' => 'value')),
array(false, false, false, 302, array('additional-parameter' => 'value')),
array(false, false, true, 302, array()),
array(false, false, array('additional-parameter'), 302, array()),
array(true, true, false, 308, array('additional-parameter' => 'value')),
array(false, true, false, 307, array('additional-parameter' => 'value')),
array(false, true, true, 307, array()),
array(false, true, array('additional-parameter'), 307, array()),
);
}

Expand All @@ -106,14 +106,14 @@ public function testEmptyPath()
$controller->urlRedirectAction($request, '', true);
$this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
} catch (HttpException $e) {
$this->assertSame(Response::HTTP_GONE, $e->getStatusCode());
$this->assertSame(410, $e->getStatusCode());
}

try {
$controller->urlRedirectAction($request, '', false);
$this->fail('Expected Symfony\Component\HttpKernel\Exception\HttpException to be thrown');
} catch (HttpException $e) {
$this->assertSame(Response::HTTP_NOT_FOUND, $e->getStatusCode());
$this->assertSame(404, $e->getStatusCode());
}
}

Expand All @@ -124,7 +124,7 @@ public function testFullURL()
$returnResponse = $controller->urlRedirectAction($request, 'http://foo.bar/');

$this->assertRedirectUrl($returnResponse, 'http://foo.bar/');
$this->assertEquals(Response::HTTP_FOUND, $returnResponse->getStatusCode());
$this->assertEquals(302, $returnResponse->getStatusCode());
}

public function testFullURLWithMethodKeep()
Expand All @@ -134,7 +134,7 @@ public function testFullURLWithMethodKeep()
$returnResponse = $controller->urlRedirectAction($request, 'http://foo.bar/', false, null, null, null, true);

$this->assertRedirectUrl($returnResponse, 'http://foo.bar/');
$this->assertEquals(Response::HTTP_TEMPORARY_REDIRECT, $returnResponse->getStatusCode());
$this->assertEquals(307, $returnResponse->getStatusCode());
}

public function testUrlRedirectDefaultPorts()
Expand Down