Skip to content
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

Jump to bottom

Fixing InvalidArgumentException with 'Cannot redirect to an empty URL' #198

Merged
merged 4 commits into from
May 28, 2019
Merged

Fixing InvalidArgumentException with 'Cannot redirect to an empty URL' #198

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec934fb
Fixing InvalidArgumentException with 'Cannot redirect to an empty URL…
May 1, 2019
8db7b14
Code-review fix + unit-test
May 27, 2019
3cf48bc
SymfonyResponseComparator was added
May 27, 2019
6077297
Extra test-cases have been added
May 28, 2019
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
15 changes: 13 additions & 2 deletions Controller/ThemeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ public function switchAction(Request $request)

$this->activeTheme->setName($theme);

$url = $request->headers->get('Referer', '/');
$response = new RedirectResponse($url);
$response = new RedirectResponse($this->extractUrl($request));

if (!empty($this->cookieOptions)) {
$cookie = new Cookie(
Expand All @@ -92,4 +91,16 @@ public function switchAction(Request $request)

return $response;
}

/**
* @param Request $request
*
* @return string
*/
private function extractUrl(Request $request)
{
$url = $request->headers->get('Referer');

return !empty($url) ? $url : '/';
iakunin marked this conversation as resolved.
Show resolved Hide resolved
}
}