GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Controller] Fix exception handler to recurse on the exception's previous (in some contexts, RedirectException gets wrapped)

This commit is contained in:
Hugo Sales 2020-09-10 20:38:40 +00:00 committed by Hugo Sales
parent ffcf909bda
commit 2164f21834
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/Controller.php
View File

@ -30,6 +30,7 @@
namespace App\Core; namespace App\Core;
use App\Util\Common;
use App\Util\Exception\RedirectException; use App\Util\Exception\RedirectException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -61,7 +62,7 @@ class Controller extends AbstractController implements EventSubscriberInterface
$controller = $event->getController(); $controller = $event->getController();
$request = $event->getRequest(); $request = $event->getRequest();
$this->vars = ['controler' => $controller, 'request' => $request]; $this->vars = ['controler' => $controller, 'request' => $request, 'have_user' => Common::user() !== null];
Event::handle('start_twig_populate_vars', [&$this->vars]); Event::handle('start_twig_populate_vars', [&$this->vars]);
$event->stopPropagation(); $event->stopPropagation();
@ -100,13 +101,16 @@ class Controller extends AbstractController implements EventSubscriberInterface
public function onKernelException(ExceptionEvent $event) public function onKernelException(ExceptionEvent $event)
{ {
if (($except = $event->getThrowable()) instanceof RedirectException) { $except = $event->getThrowable();
if (($redir = $except->redirect_response) != null) { do {
$event->setResponse($redir); if ($except instanceof RedirectException) {
} else { if (($redir = $except->redirect_response) != null) {
$event->setResponse(new RedirectResponse($event->getRequest()->getPathInfo())); $event->setResponse($redir);
} else {
$event->setResponse(new RedirectResponse($event->getRequest()->getPathInfo()));
}
} }
} } while ($except != null && ($except = $except->getPrevious()) != null);
return $event; return $event;
} }