Skip to content
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
12 changes: 10 additions & 2 deletions src/Symfony/Routing/ApiLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

namespace ApiPlatform\Symfony\Routing;

use ApiPlatform\Metadata\CollectionOperationInterface;
use ApiPlatform\Metadata\Exception\RuntimeException;
use ApiPlatform\Metadata\HttpOperation;
use ApiPlatform\Metadata\NotExposed;
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
Expand Down Expand Up @@ -58,15 +60,21 @@ public function load(mixed $data, ?string $type = null): RouteCollection
$routeCollection->addResource(new DirectoryResource($directory, '/\.php$/'));
}

if (!$notExposedOnly) {
if ($notExposedOnly) {
$routeCollection->addCollection($this->fileLoader->load('genid.php'));
} else {
$this->loadExternalFiles($routeCollection);
}

foreach ($this->resourceNameCollectionFactory->create() as $resourceClass) {
foreach ($this->resourceMetadataFactory->create($resourceClass) as $resourceMetadata) {
foreach ($resourceMetadata->getOperations() as $operationName => $operation) {
if ($notExposedOnly && !$operation instanceof NotExposed) {
continue;
if ($operation instanceof CollectionOperationInterface || !$operation instanceof HttpOperation) {
continue;
}

$operation = $operation->withController('api_platform.action.not_exposed');
}

if ($operation->getOpenapi() instanceof Webhook) {
Expand Down
11 changes: 8 additions & 3 deletions tests/Symfony/Routing/ApiLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,23 +258,28 @@ public function testApiLoaderWithPrefix(): void
);
}

public function testApiLoaderIrisTypeOnlyEmitsNotExposedRoutes(): void
public function testApiLoaderIrisTypeRegistersItemRoutesWithNotExposedController(): void
{
$resourceCollection = new ResourceMetadataCollection(Dummy::class, [
(new ApiResource())->withShortName('dummy')->withOperations(new Operations([
'api_dummies_get_item' => (new Get())->withUriTemplate('/dummies/{id}{._format}')->withController('api_platform.action.get_item'),
'api_dummies_get_collection' => (new GetCollection())->withUriTemplate('/dummies{._format}'),
'api_dummies_not_exposed_item' => (new NotExposed())->withUriTemplate('/dummies/{id}{._format}'),
'api_dummies_not_exposed_by_uuid_item' => (new NotExposed())->withUriTemplate('/dummies/by_uuid/{uuid}{._format}'),
])),
]);

$routeCollection = $this->getApiLoaderWithResourceMetadataCollection($resourceCollection)->load(null, ApiLoader::TYPE_IRIS);

$this->assertNull($routeCollection->get('api_dummies_get_item'));
$this->assertNull($routeCollection->get('api_dummies_get_collection'));
$itemRoute = $routeCollection->get('api_dummies_get_item');
$this->assertNotNull($itemRoute);
$this->assertSame('api_platform.action.not_exposed', $itemRoute->getDefault('_controller'));
$this->assertNotNull($routeCollection->get('api_dummies_not_exposed_item'));
$this->assertNotNull($routeCollection->get('api_dummies_not_exposed_by_uuid_item'));
$this->assertNull($routeCollection->get('api_dummies_get_collection'));
$this->assertNull($routeCollection->get('api_jsonld_context'));
$this->assertNull($routeCollection->get('api_entrypoint'));
$this->assertNotNull($routeCollection->get('api_genid'));
}

public function testApiLoaderWithUndefinedControllerService(): void
Expand Down
Loading