TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return redirectReponse insteadof sending it

Browse Source
This commit is contained in:
Manuel Raynaud
2014-04-28 20:45:58 +02:00
parent c4b2898830
commit 8aa5912a7a
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/lib/Thelia/Core/EventListener/ViewListener.php
View File

@@ -13,6 +13,7 @@
namespace Thelia\Core\EventListener;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
@@ -68,7 +69,7 @@ class ViewListener implements EventSubscriberInterface
$parser = $this->container->get('thelia.parser');
$parser->setTemplateDefinition(TemplateHelper::getInstance()->getActiveFrontTemplate());
$request = $this->container->get('request');
$response = null;
try {
$content = $parser->render($request->attributes->get('_view').".html");
@@ -78,27 +79,29 @@ class ViewListener implements EventSubscriberInterface
$response = new Response($content, $parser->getStatus() ?: 200);
}
$event->setResponse($response);
} catch (ResourceNotFoundException $e) {
throw new NotFoundHttpException();
} catch (AuthenticationException $ex) {
// Redirect to the login template
Redirect::exec($this->container->get('thelia.url.manager')->viewUrl($ex->getLoginTemplate()));
$response = RedirectResponse::create($this->container->get('thelia.url.manager')->viewUrl($ex->getLoginTemplate()));
} catch (OrderException $e) {
switch ($e->getCode()) {
case OrderException::CART_EMPTY:
// Redirect to the cart template
Redirect::exec($this->container->get('router.chainRequest')->generate($e->cartRoute, $e->arguments, Router::ABSOLUTE_URL));
$response = RedirectResponse::create($this->container->get('router.chainRequest')->generate($e->cartRoute, $e->arguments, Router::ABSOLUTE_URL));
break;
case OrderException::UNDEFINED_DELIVERY:
// Redirect to the delivery choice template
Redirect::exec($this->container->get('router.chainRequest')->generate($e->orderDeliveryRoute, $e->arguments, Router::ABSOLUTE_URL));
$response = RedirectResponse::create($this->container->get('router.chainRequest')->generate($e->orderDeliveryRoute, $e->arguments, Router::ABSOLUTE_URL));
break;
}
throw $e;
if (null === $response) {
throw $e;
}
}
$event->setResponse($response);
}
public function beforeKernelView(GetResponseForControllerResultEvent $event)