Skip to content

Commit 2d76b88

Browse files
alanpoulainalanpoulain
committed
fix(doctrine): use conventional service names
1 parent d262afe commit 2d76b88

File tree

3 files changed

+34
-24
lines changed

3 files changed

+34
-24
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,19 @@
1616
<factory service="doctrine_mongodb.odm.default_document_manager" method="getMetadataFactory"/>
1717
</service>
1818

19-
<service id="api_platform.doctrine_mongodb.odm.state.processor" class="ApiPlatform\Doctrine\Common\State\Processor">
19+
<service id="api_platform.doctrine_mongodb.odm.state.remove_processor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
2020
<argument type="service" id="doctrine_mongodb" />
2121

2222
<tag name="api_platform.state_processor" priority="-100" />
2323
</service>
24+
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" alias="api_platform.doctrine_mongodb.odm.state.remove_processor" />
2425

25-
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
26-
<argument type="service" id="doctrine_mongodb" />
27-
28-
<tag name="api_platform.state_processor" priority="-100" />
29-
</service>
30-
31-
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
26+
<service id="api_platform.doctrine_mongodb.odm.state.persist_processor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
3227
<argument type="service" id="doctrine_mongodb" />
3328

3429
<tag name="api_platform.state_processor" priority="-100" />
3530
</service>
31+
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" alias="api_platform.doctrine_mongodb.odm.state.persist_processor" />
3632

3733
<!-- Filter -->
3834

@@ -125,21 +121,23 @@
125121

126122
<service id="ApiPlatform\Doctrine\Odm\Filter\SearchFilter" alias="api_platform.doctrine_mongodb.odm.search_filter" />
127123

128-
<service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
124+
<service id="api_platform.doctrine_mongodb.odm.state.collection_provider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
129125
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
130126
<argument type="service" id="doctrine_mongodb" />
131127
<argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
132128

133129
<tag name="api_platform.state_provider" priority="-100" />
134130
</service>
131+
<service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" alias="api_platform.doctrine_mongodb.odm.state.collection_provider" />
135132

136-
<service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
133+
<service id="api_platform.doctrine_mongodb.odm.state.item_provider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
137134
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
138135
<argument type="service" id="doctrine_mongodb" />
139136
<argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
140137

141138
<tag name="api_platform.state_provider" priority="-100" />
142139
</service>
140+
<service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" alias="api_platform.doctrine_mongodb.odm.state.item_provider" />
143141

144142
<service id="api_platform.doctrine.odm.metadata.resource.metadata_collection_factory" class="ApiPlatform\Doctrine\Odm\Metadata\Resource\DoctrineMongoDbOdmResourceCollectionMetadataFactory" decorates="api_platform.metadata.resource.metadata_collection_factory" decoration-priority="40">
145143
<argument type="service" id="doctrine_mongodb" />

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
<factory service="doctrine.orm.default_entity_manager" method="getMetadataFactory" />
1010
</service>
1111

12-
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
12+
<service id="api_platform.doctrine.orm.state.remove_processor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
1313
<argument type="service" id="doctrine" />
1414

1515
<tag name="api_platform.state_processor" priority="-100" />
1616
</service>
17+
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" alias="api_platform.doctrine.orm.state.remove_processor" />
1718

18-
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
19+
<service id="api_platform.doctrine.orm.state.persist_processor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
1920
<argument type="service" id="doctrine" />
2021

2122
<tag name="api_platform.state_processor" priority="-100" />
2223
</service>
24+
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" alias="api_platform.doctrine.orm.state.persist_processor" />
2325

2426
<!-- Filter -->
2527

@@ -127,21 +129,23 @@
127129
<argument type="service" id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory.inner" />
128130
</service>
129131

130-
<service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
132+
<service id="api_platform.doctrine.orm.state.collection_provider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
131133
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
132134
<argument type="service" id="doctrine" />
133135
<argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
134136

135137
<tag name="api_platform.state_provider" priority="-100" />
136138
</service>
139+
<service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" alias="api_platform.doctrine.orm.state.collection_provider" />
137140

138-
<service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
141+
<service id="api_platform.doctrine.orm.state.item_provider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
139142
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
140143
<argument type="service" id="doctrine" />
141144
<argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
142145

143146
<tag name="api_platform.state_provider" priority="-100" />
144147
</service>
148+
<service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" alias="api_platform.doctrine.orm.state.item_provider" />
145149

146150
<service id="api_platform.doctrine.orm.search_filter" class="ApiPlatform\Doctrine\Orm\Filter\SearchFilter" public="false" abstract="true">
147151
<argument type="service" id="doctrine" />

‎tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -717,10 +717,10 @@ public function testDoctrineOrmConfiguration(): void
717717
$services = [
718718
// doctrine_orm.xml
719719
'api_platform.doctrine.metadata_factory',
720-
RemoveProcessor::class,
721-
PersistProcessor::class,
722-
CollectionProvider::class,
723-
ItemProvider::class,
720+
'api_platform.doctrine.orm.state.remove_processor',
721+
'api_platform.doctrine.orm.state.persist_processor',
722+
'api_platform.doctrine.orm.state.collection_provider',
723+
'api_platform.doctrine.orm.state.item_provider',
724724
'api_platform.doctrine.orm.search_filter',
725725
'api_platform.doctrine.orm.order_filter',
726726
'api_platform.doctrine.orm.range_filter',
@@ -733,6 +733,10 @@ public function testDoctrineOrmConfiguration(): void
733733

734734
$aliases = [
735735
// doctrine_orm.xml
736+
RemoveProcessor::class,
737+
PersistProcessor::class,
738+
CollectionProvider::class,
739+
ItemProvider::class,
736740
OrderFilter::class,
737741
RangeFilter::class,
738742
DateFilter::class,
@@ -767,13 +771,13 @@ public function testDoctrineMongoDbOdmConfiguration(): void
767771
(new ApiPlatformExtension())->load($config, $this->container);
768772

769773
$services = [
770-
// doctrine_mongo_odm.xml
774+
// doctrine_mongodb_odm.xml
771775
'api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor',
772776
'api_platform.doctrine.metadata_factory',
773-
RemoveProcessor::class,
774-
PersistProcessor::class,
775-
MongoDbCollectionProvider::class,
776-
MongoDbItemProvider::class,
777+
'api_platform.doctrine_mongodb.odm.state.remove_processor',
778+
'api_platform.doctrine_mongodb.odm.state.persist_processor',
779+
'api_platform.doctrine_mongodb.odm.state.collection_provider',
780+
'api_platform.doctrine_mongodb.odm.state.item_provider',
777781
'api_platform.doctrine_mongodb.odm.search_filter',
778782
'api_platform.doctrine_mongodb.odm.boolean_filter',
779783
'api_platform.doctrine_mongodb.odm.date_filter',
@@ -789,7 +793,11 @@ public function testDoctrineMongoDbOdmConfiguration(): void
789793
];
790794

791795
$aliases = [
792-
// doctrine_mongo_odm.xml
796+
// doctrine_mongodb_odm.xml
797+
RemoveProcessor::class,
798+
PersistProcessor::class,
799+
MongoDbCollectionProvider::class,
800+
MongoDbItemProvider::class,
793801
SearchFilter::class,
794802
\ApiPlatform\Doctrine\Odm\Filter\BooleanFilter::class,
795803
\ApiPlatform\Doctrine\Odm\Filter\DateFilter::class,

0 commit comments

Comments
 (0)