Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge 2.2 #1850

Merged
merged 5 commits into from
Apr 12, 2018
Merged

Merge 2.2 #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b14455
Implement ability to define the controller for a subresource
jeffreymb Apr 9, 2018
3b9f1d1
A couple fixes so existing tests pass
jeffreymb Apr 9, 2018
b514300
Add test on subresource controller
Apr 12, 2018
d34fba5
Merge pull request #1830 from jeffreymb/issue_1828
sroze Apr 12, 2018
d611aa0
Merge branch 'master' into 2.2
sroze Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Bridge/Symfony/Routing/ApiLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,18 @@ public function load($data, $type = null): RouteCollection
}

foreach ($this->subresourceOperationFactory->create($resourceClass) as $operationId => $operation) {
if (null === $controller = $operation['controller'] ?? null) {
$controller = self::DEFAULT_ACTION_PATTERN.'get_subresource';

if (!$this->container->has($controller)) {
throw new RuntimeException(sprintf('There is no builtin action for the %s %s operation. You need to define the controller yourself.', OperationType::SUBRESOURCE, 'GET'));
}
}

$routeCollection->add($operation['route_name'], new Route(
$operation['path'],
[
'_controller' => self::DEFAULT_ACTION_PATTERN.'get_subresource',
'_controller' => $controller,
'_format' => null,
'_api_resource_class' => $operation['resource_class'],
'_api_subresource_operation_name' => $operation['route_name'],
Expand Down
2 changes: 1 addition & 1 deletion src/Operation/Factory/SubresourceOperationFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class SubresourceOperationFactory implements SubresourceOperationFactoryIn
{
const SUBRESOURCE_SUFFIX = '_subresource';
const FORMAT_SUFFIX = '.{_format}';
const ROUTE_OPTIONS = ['defaults' => [], 'requirements' => [], 'options' => [], 'host' => '', 'schemes' => [], 'condition' => ''];
const ROUTE_OPTIONS = ['defaults' => [], 'requirements' => [], 'options' => [], 'host' => '', 'schemes' => [], 'condition' => '', 'controller' => null];

private $resourceMetadataFactory;
private $propertyNameCollectionFactory;
Expand Down
12 changes: 10 additions & 2 deletions tests/Bridge/Symfony/Routing/ApiLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public function testRecursiveSubresource()
);

$this->assertEquals(
$this->getSubresourceRoute('/related_dummies/{id}/recursivesubresource.{_format}', 'api_platform.action.get_subresource', DummyEntity::class, 'api_related_dummies_recursivesubresource_get_subresource', ['property' => 'recursivesubresource', 'identifiers' => [['id', RelatedDummyEntity::class, true]], 'collection' => false, 'operationId' => 'api_related_dummies_recursivesubresource_get_subresource']),
$this->getSubresourceRoute('/related_dummies/{id}/recursivesubresource.{_format}', 'dummy_controller', DummyEntity::class, 'api_related_dummies_recursivesubresource_get_subresource', ['property' => 'recursivesubresource', 'identifiers' => [['id', RelatedDummyEntity::class, true]], 'collection' => false, 'operationId' => 'api_related_dummies_recursivesubresource_get_subresource']),
$routeCollection->get('api_related_dummies_recursivesubresource_get_subresource')
);

Expand Down Expand Up @@ -232,6 +232,7 @@ private function getApiLoaderWithResourceMetadata(ResourceMetadata $resourceMeta
'api_platform.action.get_item',
'api_platform.action.put_item',
'api_platform.action.delete_item',
'api_platform.action.get_subresource',
];
$containerProphecy = $this->prophesize(ContainerInterface::class);

Expand All @@ -244,7 +245,14 @@ private function getApiLoaderWithResourceMetadata(ResourceMetadata $resourceMeta

$resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
$resourceMetadataFactoryProphecy->create(DummyEntity::class)->willReturn($resourceMetadata);
$resourceMetadataFactoryProphecy->create(RelatedDummyEntity::class)->willReturn((new ResourceMetadata())->withShortName('related_dummies'));

$relatedDummyEntityMetadata = (new ResourceMetadata())->withShortName('related_dummies')->withSubresourceOperations([
'recursivesubresource_get_subresource' => [
'controller' => 'dummy_controller',
],
]);

$resourceMetadataFactoryProphecy->create(RelatedDummyEntity::class)->willReturn($relatedDummyEntityMetadata);

$resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
$resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection([DummyEntity::class, RelatedDummyEntity::class]));
Expand Down