Skip to content

New "_api_persist" request attribute to skip the WriteListener #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2018
Merged
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
2 changes: 1 addition & 1 deletion src/EventListener/WriteListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct(DataPersisterInterface $dataPersister)
public function onKernelView(GetResponseForControllerResultEvent $event)
{
$request = $event->getRequest();
if ($request->isMethodSafe(false) || !$request->attributes->has('_api_resource_class')) {
if ($request->isMethodSafe(false) || !$request->attributes->has('_api_resource_class') || !$request->attributes->getBoolean('_api_persist', true)) {
return;
}

Expand Down
9 changes: 4 additions & 5 deletions src/Util/AttributesExtractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,10 @@ public static function extractAttributes(array $attributes): array
return [];
}

if (null === $apiRequest = $attributes['_api_receive'] ?? null) {
$result['receive'] = true;
} else {
$result['receive'] = (bool) $apiRequest;
}
$result += [
'receive' => (bool) ($attributes['_api_receive'] ?? true),
'persist' => (bool) ($attributes['_api_persist'] ?? true),
];

return $result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function testWithResource()
$this->response
);

$this->assertSame(['resource_class' => DummyEntity::class, 'item_operation_name' => 'get', 'receive' => true], $dataCollector->getRequestAttributes());
$this->assertSame(['resource_class' => DummyEntity::class, 'item_operation_name' => 'get', 'receive' => true, 'persist' => true], $dataCollector->getRequestAttributes());
$this->assertSame(['foo', 'bar'], $dataCollector->getAcceptableContentTypes());
$this->assertSame(DummyEntity::class, $dataCollector->getResourceClass());
$this->assertSame(['foo' => null, 'a_filter' => \stdClass::class], $dataCollector->getFilters());
Expand Down
2 changes: 1 addition & 1 deletion tests/EventListener/AddFormatListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public function testResourceClassSupportedRequestFormat()
$event = $eventProphecy->reveal();

$formatsProviderProphecy = $this->prophesize(FormatsProviderInterface::class);
$formatsProviderProphecy->getFormatsFromAttributes(['resource_class' => 'Foo', 'collection_operation_name' => 'get', 'receive' => true])->willReturn(['csv' => ['text/csv']])->shouldBeCalled();
$formatsProviderProphecy->getFormatsFromAttributes(['resource_class' => 'Foo', 'collection_operation_name' => 'get', 'receive' => true, 'persist' => true])->willReturn(['csv' => ['text/csv']])->shouldBeCalled();

$listener = new AddFormatListener(new Negotiator(), $formatsProviderProphecy->reveal());
$listener->onKernelRequest($event);
Expand Down
2 changes: 1 addition & 1 deletion tests/EventListener/DeserializeListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public function testDeserializeResourceClassSupportedFormat(string $method, bool
$serializerContextBuilderProphecy->createFromRequest(Argument::type(Request::class), false, Argument::type('array'))->willReturn([])->shouldBeCalled();

$formatsProviderProphecy = $this->prophesize(FormatsProviderInterface::class);
$formatsProviderProphecy->getFormatsFromAttributes(['resource_class' => 'Foo', 'collection_operation_name' => 'post', 'receive' => true])->willReturn(self::FORMATS)->shouldBeCalled();
$formatsProviderProphecy->getFormatsFromAttributes(['resource_class' => 'Foo', 'collection_operation_name' => 'post', 'receive' => true, 'persist' => true])->willReturn(self::FORMATS)->shouldBeCalled();

$listener = new DeserializeListener($serializerProphecy->reveal(), $serializerContextBuilderProphecy->reveal(), $formatsProviderProphecy->reveal());

Expand Down
25 changes: 25 additions & 0 deletions tests/EventListener/WriteListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,31 @@ public function testOnKernelViewWithSafeMethod()
(new WriteListener($dataPersisterProphecy->reveal()))->onKernelView($event);
}

public function testOnKernelViewWithPersistFlagOff()
{
$dummy = new Dummy();
$dummy->setName('Dummyrino');

$dataPersisterProphecy = $this->prophesize(DataPersisterInterface::class);
$dataPersisterProphecy->supports($dummy)->shouldNotBeCalled();
$dataPersisterProphecy->persist($dummy)->shouldNotBeCalled();
$dataPersisterProphecy->remove($dummy)->shouldNotBeCalled();

$request = new Request();
$request->setMethod('HEAD');
$request->attributes->set('_api_resource_class', Dummy::class);
$request->attributes->set('_api_persist', false);

$event = new GetResponseForControllerResultEvent(
$this->prophesize(HttpKernelInterface::class)->reveal(),
$request,
HttpKernelInterface::MASTER_REQUEST,
$dummy
);

(new WriteListener($dataPersisterProphecy->reveal()))->onKernelView($event);
}

public function testOnKernelViewWithNoResourceClass()
{
$dummy = new Dummy();
Expand Down
1 change: 1 addition & 0 deletions tests/Serializer/SerializerFilterContextBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public function testCreateFromRequestWithoutAttributes()
'resource_class' => DummyGroup::class,
'collection_operation_name' => 'get',
'receive' => true,
'persist' => true,
];

$resourceMetadata = new ResourceMetadata(
Expand Down
34 changes: 29 additions & 5 deletions tests/Util/RequestAttributesExtractorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function testExtractCollectionAttributes()
$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_collection_operation_name' => 'post']);

$this->assertEquals(
['resource_class' => 'Foo', 'collection_operation_name' => 'post', 'receive' => true],
['resource_class' => 'Foo', 'collection_operation_name' => 'post', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);
}
Expand All @@ -37,7 +37,7 @@ public function testExtractItemAttributes()
$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true],
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);
}
Expand All @@ -47,21 +47,45 @@ public function testExtractReceive()
$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '0']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => false],
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => false, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);

$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_receive' => '1']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true],
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);

$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true],
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);
}

public function testExtractPersist()
{
$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '0']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => false],
RequestAttributesExtractor::extractAttributes($request)
);

$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get', '_api_persist' => '1']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);

$request = new Request([], [], ['_api_resource_class' => 'Foo', '_api_item_operation_name' => 'get']);

$this->assertEquals(
['resource_class' => 'Foo', 'item_operation_name' => 'get', 'receive' => true, 'persist' => true],
RequestAttributesExtractor::extractAttributes($request)
);
}
Expand Down