Skip to content

Commit

Permalink
fix(symfony): store original data without clone (#6367)
Browse files Browse the repository at this point in the history
fixes #6362
  • Loading branch information
soyuka committed May 14, 2024
1 parent 4a6378c commit d809315
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/Symfony/EventListener/WriteListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public function onKernelView(ViewEvent $event): void
}
}

// $request->attributes->set('original_data', $this->clone($controllerResult));
$data = $this->processor->process($controllerResult, $operation, $uriVariables, [
'request' => $request,
'uri_variables' => $uriVariables,
Expand All @@ -113,7 +112,7 @@ public function onKernelView(ViewEvent $event): void
]);

if ($data) {
$request->attributes->set('original_data', $this->clone($data));
$request->attributes->set('original_data', $data);
}

$event->setControllerResult($data);
Expand Down
29 changes: 29 additions & 0 deletions tests/Symfony/EventListener/WriteListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -277,4 +277,33 @@ public function testOnKernelViewInvalidIdentifiers(): void

(new WriteListener($this->processorProphecy->reveal(), $this->iriConverterProphecy->reveal(), $this->resourceClassResolver->reveal(), $this->resourceMetadataCollectionFactory->reveal()))->onKernelView($event);
}

public function testHasOriginalData(): void
{
$operationResource = new OperationResource(1, 'foo');

$this->resourceClassResolver->isResourceClass(Argument::type('string'))->willReturn(true);
$this->processorProphecy->process($operationResource, Argument::type(Operation::class), [], Argument::type('array'))->willReturn($operationResource)->shouldBeCalled();

$operationResourceMetadata = new ResourceMetadataCollection(OperationResource::class, [(new ApiResource())->withOperations(new Operations([
'_api_OperationResource_post_collection' => (new Post())->withName('_api_OperationResource_post_collection'),
]))]);

$this->resourceMetadataCollectionFactory->create(OperationResource::class)->willReturn($operationResourceMetadata);

$request = new Request([], [], ['_api_resource_class' => OperationResource::class]);

$event = new ViewEvent(
$this->prophesize(HttpKernelInterface::class)->reveal(),
$request,
\defined(HttpKernelInterface::class.'::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
$operationResource
);

$request->setMethod('POST');
$request->attributes->set('_api_operation_name', sprintf('_api_%s_%s%s', 'OperationResource', 'post', '_collection'));

(new WriteListener($this->processorProphecy->reveal(), null, $this->resourceClassResolver->reveal(), $this->resourceMetadataCollectionFactory->reveal()))->onKernelView($event);
$this->assertEquals($operationResource, $request->attributes->get('original_data'));
}
}

0 comments on commit d809315

Please sign in to comment.