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 @@
-
+
-
+
+
-
+
-
-
-
-
-
-
-
+
+
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 @@
-
+
-
+
+
-
+
-
+
+
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 @@
-
+
-
+
+
-
+
-
+
+
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 @@
-
+
-
+
+
-
+
-
+
+
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">
-
+
@@ -17,7 +17,7 @@
-
+
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']);