diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpKernel] Flatten "exception" controller argument if not typed

This commit is contained in:
Robin Chalas 2019-11-16 13:02:38 +01:00
parent 278dcfb380
commit 585216a8e8
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
View File

@ -99,7 +99,7 @@ class ErrorListener implements EventSubscriberInterface
$r = new \ReflectionFunction(\Closure::fromCallable($event->getController()));
$r = $r->getParameters()[$k] ?? null;
if ($r && $r->hasType() && FlattenException::class === $r->getType()->getName()) {
if ($r && (!$r->hasType() || FlattenException::class === $r->getType()->getName())) {
$arguments = $event->getArguments();
$arguments[$k] = FlattenException::createFromThrowable($e);
$event->setArguments($arguments);

28
src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
View File

@ -13,8 +13,8 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\ErrorHandler\Exception\FlattenException;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
@ -158,12 +158,11 @@ class ErrorListenerTest extends TestCase
$this->assertFalse($dispatcher->hasListeners(KernelEvents::RESPONSE), 'CSP removal listener has been removed');
}
public function testOnControllerArguments()
/**
* @dataProvider controllerProvider
*/
public function testOnControllerArguments(callable $controller)
{
$controller = function (FlattenException $exception) {
return new Response('OK: '.$exception->getMessage());
};
$listener = new ErrorListener($controller, $this->createMock(LoggerInterface::class), true);
$kernel = $this->createMock(HttpKernelInterface::class);
@ -181,6 +180,23 @@ class ErrorListenerTest extends TestCase
$this->assertSame('OK: foo', $event->getResponse()->getContent());
}
public function controllerProvider()
{
yield [function (FlattenException $exception) {
return new Response('OK: '.$exception->getMessage());
}];
yield [function ($exception) {
$this->assertInstanceOf(FlattenException::class, $exception);
return new Response('OK: '.$exception->getMessage());
}];
yield [function (\Throwable $exception) {
return new Response('OK: '.$exception->getMessage());
}];
}
}
class TestLogger extends Logger implements DebugLoggerInterface