fix(doctrine): use conventional service names (#4859)

api-platform · Aug 2, 2022 · aac568c · aac568c
1 parent d262afe
commit aac568c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
@@ -16,23 +16,19 @@
             <factory service="doctrine_mongodb.odm.default_document_manager" method="getMetadataFactory"/>
         </service>
 
-        <service id="api_platform.doctrine_mongodb.odm.state.processor" class="ApiPlatform\Doctrine\Common\State\Processor">
-            <argument type="service" id="doctrine_mongodb" />
-
-            <tag name="api_platform.state_processor" priority="-100" />
-        </service>
-
         <service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
             <argument type="service" id="doctrine_mongodb" />
 
             <tag name="api_platform.state_processor" priority="-100" />
         </service>
+        <service id="api_platform.doctrine_mongodb.odm.state.remove_processor" alias="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
 
         <service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
             <argument type="service" id="doctrine_mongodb" />
 
             <tag name="api_platform.state_processor" priority="-100" />
         </service>
+        <service id="api_platform.doctrine_mongodb.odm.state.persist_processor" alias="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
 
         <!-- Filter -->
 
@@ -132,6 +128,7 @@
 
             <tag name="api_platform.state_provider" priority="-100" />
         </service>
+        <service id="api_platform.doctrine_mongodb.odm.state.collection_provider" alias="ApiPlatform\Doctrine\Odm\State\CollectionProvider" />
 
         <service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
@@ -140,6 +137,7 @@
 
             <tag name="api_platform.state_provider" priority="-100" />
         </service>
+        <service id="api_platform.doctrine_mongodb.odm.state.item_provider" alias="ApiPlatform\Doctrine\Odm\State\ItemProvider" />
 
         <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">
             <argument type="service" id="doctrine_mongodb" />

diff --git a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
@@ -14,12 +14,14 @@
 
             <tag name="api_platform.state_processor" priority="-100" />
         </service>
+        <service id="api_platform.doctrine.orm.state.remove_processor" alias="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
 
         <service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
             <argument type="service" id="doctrine" />
 
             <tag name="api_platform.state_processor" priority="-100" />
         </service>
+        <service id="api_platform.doctrine.orm.state.persist_processor" alias="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
 
         <!-- Filter -->
 
@@ -134,6 +136,7 @@
 
             <tag name="api_platform.state_provider" priority="-100" />
         </service>
+        <service id="api_platform.doctrine.orm.state.collection_provider" alias="ApiPlatform\Doctrine\Orm\State\CollectionProvider" />
 
         <service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
@@ -142,6 +145,7 @@
 
             <tag name="api_platform.state_provider" priority="-100" />
         </service>
+        <service id="api_platform.doctrine.orm.state.item_provider" alias="ApiPlatform\Doctrine\Orm\State\ItemProvider" />
 
         <service id="api_platform.doctrine.orm.search_filter" class="ApiPlatform\Doctrine\Orm\Filter\SearchFilter" public="false" abstract="true">
             <argument type="service" id="doctrine" />

diff --git a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -733,6 +733,10 @@ public function testDoctrineOrmConfiguration(): void
 
         $aliases = [
             // doctrine_orm.xml
+            'api_platform.doctrine.orm.state.remove_processor',
+            'api_platform.doctrine.orm.state.persist_processor',
+            'api_platform.doctrine.orm.state.collection_provider',
+            'api_platform.doctrine.orm.state.item_provider',
             OrderFilter::class,
             RangeFilter::class,
             DateFilter::class,
@@ -767,7 +771,7 @@ public function testDoctrineMongoDbOdmConfiguration(): void
         (new ApiPlatformExtension())->load($config, $this->container);
 
         $services = [
-            // doctrine_mongo_odm.xml
+            // doctrine_mongodb_odm.xml
             'api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor',
             'api_platform.doctrine.metadata_factory',
             RemoveProcessor::class,
@@ -789,7 +793,11 @@ public function testDoctrineMongoDbOdmConfiguration(): void
         ];
 
         $aliases = [
-            // doctrine_mongo_odm.xml
+            // doctrine_mongodb_odm.xml
+            'api_platform.doctrine_mongodb.odm.state.remove_processor',
+            'api_platform.doctrine_mongodb.odm.state.persist_processor',
+            'api_platform.doctrine_mongodb.odm.state.collection_provider',
+            'api_platform.doctrine_mongodb.odm.state.item_provider',
             SearchFilter::class,
             \ApiPlatform\Doctrine\Odm\Filter\BooleanFilter::class,
             \ApiPlatform\Doctrine\Odm\Filter\DateFilter::class,
@@ -808,7 +816,6 @@ public function testDoctrineMongoDbOdmConfiguration(): void
         $this->assertServiceHasTags(PersistProcessor::class, ['api_platform.state_processor']);
         $this->assertServiceHasTags(MongoDbCollectionProvider::class, ['api_platform.state_provider']);
         $this->assertServiceHasTags(MongoDbItemProvider::class, ['api_platform.state_provider']);
-        // doctrine_mongo_odm.xml
         $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor', ['property_info.list_extractor', 'property_info.type_extractor']);
         $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.filter', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);
         $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.pagination', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);