From c782b28c05d882eba928b4622515e267191a9f43 Mon Sep 17 00:00:00 2001
From: Alan Poulain <contact@alanpoulain.eu>
Date: Tue, 27 Sep 2022 18:12:19 +0200
Subject: [PATCH] fix: replace FQCN service names by snake ones

---
 CHANGELOG.md                                  |  4 ++
 .../Resources/config/doctrine_mongodb_odm.xml | 16 +++----
 .../Bundle/Resources/config/doctrine_orm.xml  | 10 +++--
 .../Resources/config/v3/doctrine_odm.xml      | 10 +++--
 .../Resources/config/v3/doctrine_orm.xml      | 10 +++--
 .../Bundle/Resources/config/v3/state.xml      |  4 +-
 .../ApiPlatformExtensionTest.php              | 45 +++++++++++--------
 7 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6332c8d29c7..4981c8766f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.7.1
+
+* Replace FQCN service names by snake ones (#5019)
+
 ## 2.7.0
 
 * chore: remove @experimental phpdoc (#4933)
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
index 5fa345f4c85..037ee945b5e 100644
--- a/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
+++ b/src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
@@ -25,23 +25,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">
+        <service id="api_platform.doctrine_mongodb.odm.state.remove_processor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
             <argument type="service" id="doctrine_mongodb" />
 
-            <tag name="api_platform.state_processor" priority="-100" />
+            <tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
         </service>
+        <service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" alias="api_platform.doctrine_mongodb.odm.state.remove_processor" />
 
-        <service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
+        <service id="api_platform.doctrine_mongodb.odm.state.persist_processor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
             <argument type="service" id="doctrine_mongodb" />
 
-            <tag name="api_platform.state_processor" priority="-100" />
-        </service>
-
-        <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" />
+            <tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
         </service>
+        <service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" alias="api_platform.doctrine_mongodb.odm.state.persist_processor" />
 
         <service id="api_platform.doctrine_mongodb.odm.data_persister" class="ApiPlatform\Core\Bridge\Doctrine\Common\DataPersister" public="false">
             <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
index 2479d53ad20..bb71a354e5e 100644
--- a/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
+++ b/src/Symfony/Bundle/Resources/config/doctrine_orm.xml
@@ -9,17 +9,19 @@
             <factory service="doctrine.orm.default_entity_manager" method="getMetadataFactory" />
         </service>
 
-        <service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
+        <service id="api_platform.doctrine.orm.state.remove_processor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
             <argument type="service" id="doctrine" />
 
-            <tag name="api_platform.state_processor" priority="-100" />
+            <tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
         </service>
+        <service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" alias="api_platform.doctrine.orm.state.remove_processor" />
 
-        <service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
+        <service id="api_platform.doctrine.orm.state.persist_processor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
             <argument type="service" id="doctrine" />
 
-            <tag name="api_platform.state_processor" priority="-100" />
+            <tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
         </service>
+        <service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" alias="api_platform.doctrine.orm.state.persist_processor" />
     </services>
 
 </container>
diff --git a/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml b/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml
index 5986aeeffea..ace96525184 100644
--- a/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml
+++ b/src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml
@@ -14,21 +14,23 @@
             <argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.metadata_factory.inner"/>
         </service>
 
-        <service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
+        <service id="api_platform.doctrine_mongodb.odm.state.collection_provider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="doctrine_mongodb" />
             <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
 
-            <tag name="api_platform.state_provider" priority="-100" />
+            <tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Odm\State\CollectionProvider" />
         </service>
+        <service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" alias="api_platform.doctrine_mongodb.odm.state.collection_provider" />
 
-        <service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
+        <service id="api_platform.doctrine_mongodb.odm.state.item_provider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="doctrine_mongodb" />
             <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
 
-            <tag name="api_platform.state_provider" priority="-100" />
+            <tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Odm\State\ItemProvider" />
         </service>
+        <service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" alias="api_platform.doctrine_mongodb.odm.state.item_provider" />
 
         <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/v3/doctrine_orm.xml b/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml
index fd47b013977..a87fb02eae1 100644
--- a/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml
+++ b/src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml
@@ -13,21 +13,23 @@
             <argument type="service" id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory.inner" />
         </service>
 
-        <service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
+        <service id="api_platform.doctrine.orm.state.collection_provider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="doctrine" />
             <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
 
-            <tag name="api_platform.state_provider" priority="-100" />
+            <tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Orm\State\CollectionProvider" />
         </service>
+        <service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" alias="api_platform.doctrine.orm.state.collection_provider" />
 
-        <service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
+        <service id="api_platform.doctrine.orm.state.item_provider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="doctrine" />
             <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
 
-            <tag name="api_platform.state_provider" priority="-100" />
+            <tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Orm\State\ItemProvider" />
         </service>
+        <service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" alias="api_platform.doctrine.orm.state.item_provider" />
 
         <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/src/Symfony/Bundle/Resources/config/v3/state.xml b/src/Symfony/Bundle/Resources/config/v3/state.xml
index 6c47d09af37..ea60a54c38a 100644
--- a/src/Symfony/Bundle/Resources/config/v3/state.xml
+++ b/src/Symfony/Bundle/Resources/config/v3/state.xml
@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <service id="api_platform.state_provider.locator" class="ApiPlatform\State\CallableProvider">
-            <argument type="tagged_locator" tag="api_platform.state_provider"/>
+            <argument type="tagged_locator" tag="api_platform.state_provider" index-by="key" />
         </service>
         <service id="api_platform.state_provider" alias="api_platform.state_provider.locator" />
 
@@ -17,7 +17,7 @@
         <service id="api_platform.pagination" alias="api_platform.pagination.next" />
 
         <service id="api_platform.state_processor.locator" class="ApiPlatform\State\CallableProcessor">
-            <argument type="tagged_locator" tag="api_platform.state_processor"/>
+            <argument type="tagged_locator" tag="api_platform.state_processor" index-by="key" />
         </service>
         <service id="api_platform.state_processor" alias="api_platform.state_processor.locator" />
     </services>
diff --git a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
index b99de451c89..c14a7a17394 100644
--- a/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
+++ b/tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
@@ -1135,10 +1135,10 @@ public function testDoctrineOrmConfiguration(): void
         $services = [
             // doctrine_orm.xml
             'api_platform.doctrine.metadata_factory',
-            RemoveProcessor::class,
-            PersistProcessor::class,
-            CollectionProvider::class,
-            ItemProvider::class,
+            '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',
             'api_platform.doctrine.orm.search_filter',
             'api_platform.doctrine.orm.order_filter',
             'api_platform.doctrine.orm.range_filter',
@@ -1161,6 +1161,10 @@ public function testDoctrineOrmConfiguration(): void
 
         $aliases = [
             // doctrine_orm.xml
+            RemoveProcessor::class,
+            PersistProcessor::class,
+            CollectionProvider::class,
+            ItemProvider::class,
             'ApiPlatform\Doctrine\Orm\Filter\OrderFilter',
             'ApiPlatform\Doctrine\Orm\Filter\RangeFilter',
             'ApiPlatform\Doctrine\Orm\Filter\DateFilter',
@@ -1177,10 +1181,10 @@ public function testDoctrineOrmConfiguration(): void
         $this->assertContainerHas($services, $aliases);
 
         // doctrine_orm.xml
-        $this->assertServiceHasTags(RemoveProcessor::class, ['api_platform.state_processor']);
-        $this->assertServiceHasTags(PersistProcessor::class, ['api_platform.state_processor']);
-        $this->assertServiceHasTags(CollectionProvider::class, ['api_platform.state_provider']);
-        $this->assertServiceHasTags(ItemProvider::class, ['api_platform.state_provider']);
+        $this->assertServiceHasTags('api_platform.doctrine.orm.state.remove_processor', ['api_platform.state_processor']);
+        $this->assertServiceHasTags('api_platform.doctrine.orm.state.persist_processor', ['api_platform.state_processor']);
+        $this->assertServiceHasTags('api_platform.doctrine.orm.state.collection_provider', ['api_platform.state_provider']);
+        $this->assertServiceHasTags('api_platform.doctrine.orm.state.item_provider', ['api_platform.state_provider']);
         $this->assertServiceHasTags('api_platform.doctrine.orm.query_extension.eager_loading', ['api_platform.doctrine.orm.query_extension.item', 'api_platform.doctrine.orm.query_extension.collection']);
         $this->assertServiceHasTags('api_platform.doctrine.orm.query_extension.filter', ['api_platform.doctrine.orm.query_extension.collection']);
         $this->assertServiceHasTags('api_platform.doctrine.orm.query_extension.filter_eager_loading', ['api_platform.doctrine.orm.query_extension.collection']);
@@ -1201,13 +1205,13 @@ 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,
-            PersistProcessor::class,
-            MongoDbCollectionProvider::class,
-            MongoDbItemProvider::class,
+            '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',
             'api_platform.doctrine_mongodb.odm.search_filter',
             'api_platform.doctrine_mongodb.odm.boolean_filter',
             'api_platform.doctrine_mongodb.odm.date_filter',
@@ -1232,7 +1236,11 @@ public function testDoctrineMongoDbOdmConfiguration(): void
         ];
 
         $aliases = [
-            // doctrine_mongo_odm.xml
+            // doctrine_mongodb_odm.xml
+            RemoveProcessor::class,
+            PersistProcessor::class,
+            MongoDbCollectionProvider::class,
+            MongoDbItemProvider::class,
             'ApiPlatform\Doctrine\Odm\Filter\SearchFilter',
             'ApiPlatform\Doctrine\Odm\Filter\BooleanFilter',
             'ApiPlatform\Doctrine\Odm\Filter\DateFilter',
@@ -1247,11 +1255,10 @@ public function testDoctrineMongoDbOdmConfiguration(): void
 
         $this->assertContainerHas($services, $aliases);
 
-        $this->assertServiceHasTags(RemoveProcessor::class, ['api_platform.state_processor']);
-        $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.state.remove_processor', ['api_platform.state_processor']);
+        $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.persist_processor', ['api_platform.state_processor']);
+        $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.collection_provider', ['api_platform.state_provider']);
+        $this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.item_provider', ['api_platform.state_provider']);
         $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']);