Skip to content

Commit 2ce4d6c

Browse files
fix: remove legacy code
1 parent 006ebf9 commit 2ce4d6c

File tree

6 files changed

+2
-16
lines changed

6 files changed

+2
-16
lines changed

src/HttpCache/EventListener/AddTagsListener.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,9 @@ public function onKernelResponse(ResponseEvent $event): void
7070
}
7171

7272
$resources = $request->attributes->get('_resources');
73-
if (isset($attributes['collection_operation_name']) || ($attributes['subresource_context']['collection'] ?? false) || ($operation && $operation instanceof CollectionOperationInterface)) {
73+
if ($operation instanceof CollectionOperationInterface) {
7474
// Allows to purge collections
7575
$uriVariables = $this->getOperationUriVariables($operation, $request->attributes->all(), $attributes['resource_class']);
76-
7776
$iri = $this->iriConverter->getIriFromResource($attributes['resource_class'], UrlGeneratorInterface::ABS_PATH, $operation, ['uri_variables' => $uriVariables]);
7877

7978
$resources[$iri] = $iri;

src/Metadata/Resource/Factory/AlternateUriResourceMetadataCollectionFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
3939
}
4040

4141
foreach ($resourceMetadataCollection as $i => $resource) {
42-
if (0 === $i || ($resource->getExtraProperties()['is_legacy_subresource'] ?? false) || ($resource->getExtraProperties()['is_legacy_resource_metadata'] ?? false)) {
42+
if (0 === $i) {
4343
continue;
4444
}
4545

src/Metadata/Resource/Factory/OperationNameResourceMetadataCollectionFactory.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ public function create(string $resourceClass): ResourceMetadataCollection
5757
}
5858

5959
$newOperationName = sprintf('_api_%s_%s%s', $operation->getUriTemplate() ?: $operation->getShortName(), strtolower($operation->getMethod() ?? HttpOperation::METHOD_GET), $operation instanceof CollectionOperationInterface ? '_collection' : '');
60-
61-
// TODO: remove in 3.0 this is used in the IRI converter to avoid a bc break
62-
if (($extraProperties = $operation->getExtraProperties()) && isset($extraProperties['is_legacy_subresource'])) {
63-
$extraProperties['legacy_subresource_operation_name'] = $newOperationName;
64-
$operation = $operation->withExtraProperties($extraProperties);
65-
}
66-
6760
$operations->remove($operationName)->add($newOperationName, $operation->withName($newOperationName));
6861
}
6962

src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ private function generateUriTemplate(HttpOperation $operation): string
102102
$uriVariables = $operation->getUriVariables() ?? [];
103103

104104
if ($parameters = array_keys($uriVariables)) {
105-
if (($operation->getExtraProperties()['is_legacy_resource_metadata'] ?? false) && 1 < \count($uriVariables[$parameters[0]]->getIdentifiers() ?? [])) {
106-
$parameters[0] = 'id';
107-
}
108-
109105
foreach ($parameters as $parameterName) {
110106
$uriTemplate .= sprintf('/{%s}', $parameterName);
111107
}

src/Symfony/Bundle/Resources/config/api.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
<service id="api_platform.action.patch_item" alias="api_platform.action.placeholder" public="true" />
8989
<service id="api_platform.action.put_item" alias="api_platform.action.placeholder" public="true" />
9090
<service id="api_platform.action.delete_item" alias="api_platform.action.placeholder" public="true" />
91-
<service id="api_platform.action.get_subresource" alias="api_platform.action.placeholder" public="true" />
9291
<service id="api_platform.action.not_found" class="ApiPlatform\Action\NotFoundAction" public="true" />
9392
<service id="ApiPlatform\Action\NotFoundAction" alias="api_platform.action.not_found" public="true" />
9493

src/Symfony/Bundle/Resources/config/symfony/events.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<argument>api_platform.cache.metadata.resource_collection</argument>
8484
<argument>api_platform.cache.route_name_resolver</argument>
8585
<argument>api_platform.cache.identifiers_extractor</argument>
86-
<argument>api_platform.cache.subresource_operation_factory</argument>
8786
<argument>api_platform.elasticsearch.cache.metadata.document</argument>
8887
</argument>
8988
<tag name="kernel.cache_warmer" priority="64" />

0 commit comments

Comments
 (0)