Skip to content

Commit 6d2f883

Browse files
authored
fix(metadata): remove identifier_metadata_factory services (#5518)
fixes #5506
1 parent 6d7aaf7 commit 6d2f883

File tree

6 files changed

+1
-52
lines changed

6 files changed

+1
-52
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,6 @@
149149
<argument type="service" id="doctrine_mongodb" />
150150
<argument type="service" id="api_platform.doctrine.odm.metadata.resource.metadata_collection_factory.inner" />
151151
</service>
152-
153-
<service id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory"
154-
class="ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory"
155-
decorates="api_platform.metadata.property.identifier_metadata_factory"
156-
decoration-priority="40">
157-
<argument type="service" id="doctrine_mongodb"/>
158-
<argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory.inner"/>
159-
</service>
160-
161152
</services>
162153

163154
</container>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@
126126
<argument type="service" id="api_platform.doctrine.orm.metadata.property.metadata_factory.inner" />
127127
</service>
128128

129-
<service id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory" class="ApiPlatform\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="40">
130-
<argument type="service" id="doctrine" />
131-
<argument type="service" id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory.inner" />
132-
</service>
133-
134129
<service id="api_platform.doctrine.orm.state.collection_provider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
135130
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
136131
<argument type="service" id="doctrine" />

src/Symfony/Bundle/Resources/config/metadata/links.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<service id="api_platform.metadata.resource.link_factory" class="ApiPlatform\Metadata\Resource\Factory\LinkFactory" public="false">
99
<argument type="service" id="api_platform.metadata.property.name_collection_factory" />
10-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory" />
10+
<argument type="service" id="api_platform.metadata.property.metadata_factory" />
1111
<argument type="service" id="api_platform.resource_class_resolver" />
1212
</service>
1313
</services>

src/Symfony/Bundle/Resources/config/metadata/property.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,33 +42,6 @@
4242
<argument type="service" id="api_platform.metadata.property_extractor.xml" />
4343
</service>
4444

45-
<!-- Property metadata used to compute identifiers, we want to avoid using the serializer property metadata factory -->
46-
<!-- TODO: in 3.0 the serializer property metadata factory doesn't need the resource metadata anymore so these will be removed -->
47-
<service id="api_platform.metadata.property.identifier_metadata_factory" alias="api_platform.metadata.property.identifier_metadata_factory.property_info" />
48-
49-
<service id="api_platform.metadata.property.identifier_metadata_factory.property_info" class="ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyMetadataFactory" public="false">
50-
<argument type="service" id="api_platform.property_info" />
51-
</service>
52-
53-
<service id="api_platform.metadata.property.identifier_metadata_factory.attribute" class="ApiPlatform\Metadata\Property\Factory\AttributePropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" public="false" decoration-priority="20">
54-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.attribute.inner" />
55-
</service>
56-
57-
<service id="api_platform.metadata.property.identifier_metadata_factory.xml" decorates="api_platform.metadata.property.identifier_metadata_factory" class="ApiPlatform\Metadata\Property\Factory\ExtractorPropertyMetadataFactory" public="false" decoration-priority="10">
58-
<argument type="service" id="api_platform.metadata.property_extractor.xml" />
59-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.xml.inner" />
60-
</service>
61-
62-
<service id="api_platform.metadata.property.identifier_metadata_factory.identifier" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="30" class="ApiPlatform\Metadata\Property\Factory\IdentifierPropertyMetadataFactory" public="false">
63-
<argument type="service" id="api_platform.resource_class_resolver" />
64-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.identifier.inner" />
65-
</service>
66-
67-
<service id="api_platform.metadata.property.identifier_metadata_factory.cached" class="ApiPlatform\Metadata\Property\Factory\CachedPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="-10" public="false">
68-
<argument type="service" id="api_platform.cache.metadata.property" />
69-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.cached.inner" />
70-
</service>
71-
7245
<!-- Cache -->
7346
<service id="api_platform.cache.metadata.property" parent="cache.system" public="false">
7447
<tag name="cache.pool" />

src/Symfony/Bundle/Resources/config/metadata/yaml.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,5 @@
3737
<argument type="service" id="api_platform.metadata.property_extractor.yaml" />
3838
<argument type="service" id="api_platform.metadata.property.name_collection_factory.yaml.inner" />
3939
</service>
40-
41-
<service id="api_platform.metadata.property.identifier_metadata_factory.yaml" class="ApiPlatform\Metadata\Property\Factory\ExtractorPropertyMetadataFactory" decorates="api_platform.metadata.property.identifier_metadata_factory" decoration-priority="20" public="false">
42-
<argument type="service" id="api_platform.metadata.property_extractor.yaml" />
43-
<argument type="service" id="api_platform.metadata.property.identifier_metadata_factory.yaml.inner" />
44-
</service>
4540
</services>
4641
</container>

tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,6 @@ public function testMetadataConfiguration(): void
353353
'api_platform.metadata.property.metadata_factory.cached',
354354
'api_platform.metadata.property.metadata_factory.default_property',
355355
'api_platform.metadata.property.metadata_factory.xml',
356-
'api_platform.metadata.property.identifier_metadata_factory.attribute',
357-
'api_platform.metadata.property.identifier_metadata_factory.xml',
358-
'api_platform.metadata.property.identifier_metadata_factory.yaml',
359356
'api_platform.cache.metadata.property',
360357

361358
// metadata/property_name.xml
@@ -400,7 +397,6 @@ public function testMetadataConfiguration(): void
400397
PropertyNameCollectionFactoryInterface::class,
401398

402399
// metadata/property.xml
403-
'api_platform.metadata.property.identifier_metadata_factory',
404400
'api_platform.metadata.property.metadata_factory',
405401

406402
// metadata/resource.xml
@@ -815,7 +811,6 @@ public function testDoctrineMongoDbOdmConfiguration(): void
815811
'api_platform.doctrine_mongodb.odm.aggregation_extension.filter',
816812
'api_platform.doctrine_mongodb.odm.aggregation_extension.pagination',
817813
'api_platform.doctrine_mongodb.odm.aggregation_extension.order',
818-
'api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory',
819814
];
820815

821816
$aliases = [

0 commit comments

Comments
 (0)