Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions src/Symfony/EventListener/ErrorListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,30 @@ protected function duplicateRequest(\Throwable $exception, Request $request): Re

// Let the error handler take this we don't handle HTML nor non-api platform requests
if (false === ($apiOperation?->getExtraProperties()['_api_error_handler'] ?? true) || 'html' === $format) {
$this->controller = 'error_controller';
if (null === $this->controller) {
$dup = $request->duplicate(null, null, ['_controller' => 'error_controller', 'exception' => $exception]);
$dup->setMethod('GET');

return parent::duplicateRequest($exception, $request);
return $dup;
}

$dup = parent::duplicateRequest($exception, $request);
$dup->attributes->set('_controller', 'error_controller');

return $dup;
}

if ($this->debug) {
$this->logger?->error('An exception occured, transforming to an Error resource.', ['exception' => $exception, 'operation' => $apiOperation]);
}

$dup = parent::duplicateRequest($exception, $request);

if ($dup === $request) {
$dup = $request->duplicate(null, null, ['exception' => $exception]);
$dup->setMethod('GET');
}

$operation = $this->initializeExceptionOperation($request, $exception, $format, $apiOperation);

if (null === $operation->getProvider()) {
Expand Down
23 changes: 23 additions & 0 deletions src/Symfony/Tests/EventListener/ErrorListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,27 @@ public function testDuplicateExceptionWithErrorResource(): void
$errorListener = new ErrorListener('action', null, true, [], $resourceMetadataCollectionFactory, ['jsonld' => ['application/ld+json']], [], $identifiersExtractor, $resourceClassResolver);
$errorListener->onKernelException($exceptionEvent);
}

public function testStateIsNeverModified(): void
{
$resourceClassResolver = $this->createMock(ResourceClassResolverInterface::class);
$kernel = $this->createStub(KernelInterface::class);
$kernel->method('handle')->willReturn(new Response());

$request = Request::create('/');
$request->headers->set('Accept', 'text/html');
$exception = new \Exception();
$exceptionEvent = new ExceptionEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $exception);

$initialController = 'initial_controller';
$errorListener = new ErrorListener($initialController, null, false, [], null, ['jsonproblem' => ['application/problem+json']], [], null, $resourceClassResolver);

$errorListener->onKernelException($exceptionEvent);

$refl = new \ReflectionClass($errorListener);
$controllerProp = $refl->getProperty('controller');
$controllerProp->setAccessible(true);

$this->assertEquals($initialController, $controllerProp->getValue($errorListener), 'The controller property must never be modified.');
}
}
Loading