Skip to content

Commit d809315

Browse files
authored
fix(symfony): store original data without clone (#6367)
fixes #6362
1 parent 4a6378c commit d809315

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

src/Symfony/EventListener/WriteListener.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public function onKernelView(ViewEvent $event): void
104104
}
105105
}
106106

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

115114
if ($data) {
116-
$request->attributes->set('original_data', $this->clone($data));
115+
$request->attributes->set('original_data', $data);
117116
}
118117

119118
$event->setControllerResult($data);

tests/Symfony/EventListener/WriteListenerTest.php

+29
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,33 @@ public function testOnKernelViewInvalidIdentifiers(): void
277277

278278
(new WriteListener($this->processorProphecy->reveal(), $this->iriConverterProphecy->reveal(), $this->resourceClassResolver->reveal(), $this->resourceMetadataCollectionFactory->reveal()))->onKernelView($event);
279279
}
280+
281+
public function testHasOriginalData(): void
282+
{
283+
$operationResource = new OperationResource(1, 'foo');
284+
285+
$this->resourceClassResolver->isResourceClass(Argument::type('string'))->willReturn(true);
286+
$this->processorProphecy->process($operationResource, Argument::type(Operation::class), [], Argument::type('array'))->willReturn($operationResource)->shouldBeCalled();
287+
288+
$operationResourceMetadata = new ResourceMetadataCollection(OperationResource::class, [(new ApiResource())->withOperations(new Operations([
289+
'_api_OperationResource_post_collection' => (new Post())->withName('_api_OperationResource_post_collection'),
290+
]))]);
291+
292+
$this->resourceMetadataCollectionFactory->create(OperationResource::class)->willReturn($operationResourceMetadata);
293+
294+
$request = new Request([], [], ['_api_resource_class' => OperationResource::class]);
295+
296+
$event = new ViewEvent(
297+
$this->prophesize(HttpKernelInterface::class)->reveal(),
298+
$request,
299+
\defined(HttpKernelInterface::class.'::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
300+
$operationResource
301+
);
302+
303+
$request->setMethod('POST');
304+
$request->attributes->set('_api_operation_name', sprintf('_api_%s_%s%s', 'OperationResource', 'post', '_collection'));
305+
306+
(new WriteListener($this->processorProphecy->reveal(), null, $this->resourceClassResolver->reveal(), $this->resourceMetadataCollectionFactory->reveal()))->onKernelView($event);
307+
$this->assertEquals($operationResource, $request->attributes->get('original_data'));
308+
}
280309
}

0 commit comments

Comments
 (0)