Skip to content

Commit aac568c

Browse files
authored
fix(doctrine): use conventional service names (#4859)
1 parent d262afe commit aac568c

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

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

Lines changed: 4 additions & 6 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">
20-
<argument type="service" id="doctrine_mongodb" />
21-
22-
<tag name="api_platform.state_processor" priority="-100" />
23-
</service>
24-
2519
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
2620
<argument type="service" id="doctrine_mongodb" />
2721

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

3126
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" 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="api_platform.doctrine_mongodb.odm.state.persist_processor" alias="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
3632

3733
<!-- Filter -->
3834

@@ -132,6 +128,7 @@
132128

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

136133
<service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
137134
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
@@ -140,6 +137,7 @@
140137

141138
<tag name="api_platform.state_provider" priority="-100" />
142139
</service>
140+
<service id="api_platform.doctrine_mongodb.odm.state.item_provider" alias="ApiPlatform\Doctrine\Odm\State\ItemProvider" />
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414

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

1819
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" 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="api_platform.doctrine.orm.state.persist_processor" alias="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
2325

2426
<!-- Filter -->
2527

@@ -134,6 +136,7 @@
134136

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

138141
<service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
139142
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
@@ -142,6 +145,7 @@
142145

143146
<tag name="api_platform.state_provider" priority="-100" />
144147
</service>
148+
<service id="api_platform.doctrine.orm.state.item_provider" alias="ApiPlatform\Doctrine\Orm\State\ItemProvider" />
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: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,10 @@ public function testDoctrineOrmConfiguration(): void
733733

734734
$aliases = [
735735
// doctrine_orm.xml
736+
'api_platform.doctrine.orm.state.remove_processor',
737+
'api_platform.doctrine.orm.state.persist_processor',
738+
'api_platform.doctrine.orm.state.collection_provider',
739+
'api_platform.doctrine.orm.state.item_provider',
736740
OrderFilter::class,
737741
RangeFilter::class,
738742
DateFilter::class,
@@ -767,7 +771,7 @@ 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',
773777
RemoveProcessor::class,
@@ -789,7 +793,11 @@ public function testDoctrineMongoDbOdmConfiguration(): void
789793
];
790794

791795
$aliases = [
792-
// doctrine_mongo_odm.xml
796+
// doctrine_mongodb_odm.xml
797+
'api_platform.doctrine_mongodb.odm.state.remove_processor',
798+
'api_platform.doctrine_mongodb.odm.state.persist_processor',
799+
'api_platform.doctrine_mongodb.odm.state.collection_provider',
800+
'api_platform.doctrine_mongodb.odm.state.item_provider',
793801
SearchFilter::class,
794802
\ApiPlatform\Doctrine\Odm\Filter\BooleanFilter::class,
795803
\ApiPlatform\Doctrine\Odm\Filter\DateFilter::class,
@@ -808,7 +816,6 @@ public function testDoctrineMongoDbOdmConfiguration(): void
808816
$this->assertServiceHasTags(PersistProcessor::class, ['api_platform.state_processor']);
809817
$this->assertServiceHasTags(MongoDbCollectionProvider::class, ['api_platform.state_provider']);
810818
$this->assertServiceHasTags(MongoDbItemProvider::class, ['api_platform.state_provider']);
811-
// doctrine_mongo_odm.xml
812819
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor', ['property_info.list_extractor', 'property_info.type_extractor']);
813820
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.filter', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);
814821
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.pagination', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);

0 commit comments

Comments
 (0)