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

[ResourceBundle] Pass $resource in redirectToIndex parameters #5036

Merged
merged 1 commit into from
May 16, 2016
Merged

[ResourceBundle] Pass $resource in redirectToIndex parameters #5036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ResourceBundle/Controller/RedirectHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function redirectToIndex(RequestConfiguration $configuration, ResourceInt
return $this->redirectToRoute(
$configuration,
$configuration->getRedirectRoute('index'),
$configuration->getRedirectParameters()
$configuration->getRedirectParameters($resource)
);
}

Expand Down
11 changes: 7 additions & 4 deletions src/Sylius/Bundle/ResourceBundle/spec/Controller/RedirectHandlerSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,20 @@ function it_fallbacks_to_index_route_if_show_does_not_exist(
$this->redirectToResource($configuration, $resource)->shouldHaveType(RedirectResponse::class);
}

function it_redirects_to_index(RequestConfiguration $configuration, $router)
{
function it_redirects_to_index(
RequestConfiguration $configuration,
ResourceInterface $resource,
RouterInterface $router
) {
$configuration->getRedirectRoute('index')->willReturn('my_route');
$configuration->getRedirectParameters()->willReturn([]);
$configuration->getRedirectParameters($resource)->willReturn([]);

$router->generate('my_route', [])->willReturn('http://myurl.com');

$configuration->getRedirectHash()->willReturn(null);
$configuration->isHeaderRedirection()->willReturn(false);

$this->redirectToIndex($configuration)->shouldHaveType(RedirectResponse::class);
$this->redirectToIndex($configuration, $resource)->shouldHaveType(RedirectResponse::class);
}

function it_redirects_to_route(RequestConfiguration $configuration, $router)
Expand Down