Skip to content

Commit 44ba110

Browse files
alanpoulainalanpoulain
authored
fix: replace FQCN service names by snake ones (api-platform#5019)
1 parent 4ca639c commit 44ba110

File tree

7 files changed

+56
-43
lines changed

7 files changed

+56
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 2.7.1
4+
5+
* Replace FQCN service names by snake ones (#5019)
6+
37
## 2.7.0
48

59
* chore: remove @experimental phpdoc (#4933)

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,19 @@
2525
<factory service="doctrine_mongodb.odm.default_document_manager" method="getMetadataFactory"/>
2626
</service>
2727

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

31-
<tag name="api_platform.state_processor" priority="-100" />
31+
<tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
3232
</service>
33+
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" alias="api_platform.doctrine_mongodb.odm.state.remove_processor" />
3334

34-
<service id="ApiPlatform\Doctrine\Common\State\RemoveProcessor" class="ApiPlatform\Doctrine\Common\State\RemoveProcessor">
35+
<service id="api_platform.doctrine_mongodb.odm.state.persist_processor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
3536
<argument type="service" id="doctrine_mongodb" />
3637

37-
<tag name="api_platform.state_processor" priority="-100" />
38-
</service>
39-
40-
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" class="ApiPlatform\Doctrine\Common\State\PersistProcessor">
41-
<argument type="service" id="doctrine_mongodb" />
42-
43-
<tag name="api_platform.state_processor" priority="-100" />
38+
<tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\PersistProcessor" />
4439
</service>
40+
<service id="ApiPlatform\Doctrine\Common\State\PersistProcessor" alias="api_platform.doctrine_mongodb.odm.state.persist_processor" />
4541

4642
<service id="api_platform.doctrine_mongodb.odm.data_persister" class="ApiPlatform\Core\Bridge\Doctrine\Common\DataPersister" public="false">
4743
<argument type="service" id="doctrine_mongodb" />

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

Lines changed: 6 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

15-
<tag name="api_platform.state_processor" priority="-100" />
15+
<tag name="api_platform.state_processor" priority="-100" key="ApiPlatform\Doctrine\Common\State\RemoveProcessor" />
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

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

2527
</container>

‎src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,23 @@
1414
<argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.metadata_factory.inner"/>
1515
</service>
1616

17-
<service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
17+
<service id="api_platform.doctrine_mongodb.odm.state.collection_provider" class="ApiPlatform\Doctrine\Odm\State\CollectionProvider" public="false">
1818
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
1919
<argument type="service" id="doctrine_mongodb" />
2020
<argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
2121

22-
<tag name="api_platform.state_provider" priority="-100" />
22+
<tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Odm\State\CollectionProvider" />
2323
</service>
24+
<service id="ApiPlatform\Doctrine\Odm\State\CollectionProvider" alias="api_platform.doctrine_mongodb.odm.state.collection_provider" />
2425

25-
<service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
26+
<service id="api_platform.doctrine_mongodb.odm.state.item_provider" class="ApiPlatform\Doctrine\Odm\State\ItemProvider" public="false">
2627
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
2728
<argument type="service" id="doctrine_mongodb" />
2829
<argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
2930

30-
<tag name="api_platform.state_provider" priority="-100" />
31+
<tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Odm\State\ItemProvider" />
3132
</service>
33+
<service id="ApiPlatform\Doctrine\Odm\State\ItemProvider" alias="api_platform.doctrine_mongodb.odm.state.item_provider" />
3234

3335
<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">
3436
<argument type="service" id="doctrine_mongodb" />

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,23 @@
1313
<argument type="service" id="api_platform.doctrine.orm.metadata.property.identifier_metadata_factory.inner" />
1414
</service>
1515

16-
<service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
16+
<service id="api_platform.doctrine.orm.state.collection_provider" class="ApiPlatform\Doctrine\Orm\State\CollectionProvider" public="false">
1717
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
1818
<argument type="service" id="doctrine" />
1919
<argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
2020

21-
<tag name="api_platform.state_provider" priority="-100" />
21+
<tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Orm\State\CollectionProvider" />
2222
</service>
23+
<service id="ApiPlatform\Doctrine\Orm\State\CollectionProvider" alias="api_platform.doctrine.orm.state.collection_provider" />
2324

24-
<service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
25+
<service id="api_platform.doctrine.orm.state.item_provider" class="ApiPlatform\Doctrine\Orm\State\ItemProvider" public="false">
2526
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
2627
<argument type="service" id="doctrine" />
2728
<argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
2829

29-
<tag name="api_platform.state_provider" priority="-100" />
30+
<tag name="api_platform.state_provider" priority="-100" key="ApiPlatform\Doctrine\Orm\State\ItemProvider" />
3031
</service>
32+
<service id="ApiPlatform\Doctrine\Orm\State\ItemProvider" alias="api_platform.doctrine.orm.state.item_provider" />
3133

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

‎src/Symfony/Bundle/Resources/config/v3/state.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66
<services>
77
<service id="api_platform.state_provider.locator" class="ApiPlatform\State\CallableProvider">
8-
<argument type="tagged_locator" tag="api_platform.state_provider"/>
8+
<argument type="tagged_locator" tag="api_platform.state_provider" index-by="key" />
99
</service>
1010
<service id="api_platform.state_provider" alias="api_platform.state_provider.locator" />
1111

@@ -17,7 +17,7 @@
1717
<service id="api_platform.pagination" alias="api_platform.pagination.next" />
1818

1919
<service id="api_platform.state_processor.locator" class="ApiPlatform\State\CallableProcessor">
20-
<argument type="tagged_locator" tag="api_platform.state_processor"/>
20+
<argument type="tagged_locator" tag="api_platform.state_processor" index-by="key" />
2121
</service>
2222
<service id="api_platform.state_processor" alias="api_platform.state_processor.locator" />
2323
</services>

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

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,10 +1135,10 @@ public function testDoctrineOrmConfiguration(): void
11351135
$services = [
11361136
// doctrine_orm.xml
11371137
'api_platform.doctrine.metadata_factory',
1138-
RemoveProcessor::class,
1139-
PersistProcessor::class,
1140-
CollectionProvider::class,
1141-
ItemProvider::class,
1138+
'api_platform.doctrine.orm.state.remove_processor',
1139+
'api_platform.doctrine.orm.state.persist_processor',
1140+
'api_platform.doctrine.orm.state.collection_provider',
1141+
'api_platform.doctrine.orm.state.item_provider',
11421142
'api_platform.doctrine.orm.search_filter',
11431143
'api_platform.doctrine.orm.order_filter',
11441144
'api_platform.doctrine.orm.range_filter',
@@ -1161,6 +1161,10 @@ public function testDoctrineOrmConfiguration(): void
11611161

11621162
$aliases = [
11631163
// doctrine_orm.xml
1164+
RemoveProcessor::class,
1165+
PersistProcessor::class,
1166+
CollectionProvider::class,
1167+
ItemProvider::class,
11641168
'ApiPlatform\Doctrine\Orm\Filter\OrderFilter',
11651169
'ApiPlatform\Doctrine\Orm\Filter\RangeFilter',
11661170
'ApiPlatform\Doctrine\Orm\Filter\DateFilter',
@@ -1177,10 +1181,10 @@ public function testDoctrineOrmConfiguration(): void
11771181
$this->assertContainerHas($services, $aliases);
11781182

11791183
// doctrine_orm.xml
1180-
$this->assertServiceHasTags(RemoveProcessor::class, ['api_platform.state_processor']);
1181-
$this->assertServiceHasTags(PersistProcessor::class, ['api_platform.state_processor']);
1182-
$this->assertServiceHasTags(CollectionProvider::class, ['api_platform.state_provider']);
1183-
$this->assertServiceHasTags(ItemProvider::class, ['api_platform.state_provider']);
1184+
$this->assertServiceHasTags('api_platform.doctrine.orm.state.remove_processor', ['api_platform.state_processor']);
1185+
$this->assertServiceHasTags('api_platform.doctrine.orm.state.persist_processor', ['api_platform.state_processor']);
1186+
$this->assertServiceHasTags('api_platform.doctrine.orm.state.collection_provider', ['api_platform.state_provider']);
1187+
$this->assertServiceHasTags('api_platform.doctrine.orm.state.item_provider', ['api_platform.state_provider']);
11841188
$this->assertServiceHasTags('api_platform.doctrine.orm.query_extension.eager_loading', ['api_platform.doctrine.orm.query_extension.item', 'api_platform.doctrine.orm.query_extension.collection']);
11851189
$this->assertServiceHasTags('api_platform.doctrine.orm.query_extension.filter', ['api_platform.doctrine.orm.query_extension.collection']);
11861190
$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
12011205
(new ApiPlatformExtension())->load($config, $this->container);
12021206

12031207
$services = [
1204-
// doctrine_mongo_odm.xml
1208+
// doctrine_mongodb_odm.xml
12051209
'api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor',
12061210
'api_platform.doctrine.metadata_factory',
1207-
RemoveProcessor::class,
1208-
PersistProcessor::class,
1209-
MongoDbCollectionProvider::class,
1210-
MongoDbItemProvider::class,
1211+
'api_platform.doctrine_mongodb.odm.state.remove_processor',
1212+
'api_platform.doctrine_mongodb.odm.state.persist_processor',
1213+
'api_platform.doctrine_mongodb.odm.state.collection_provider',
1214+
'api_platform.doctrine_mongodb.odm.state.item_provider',
12111215
'api_platform.doctrine_mongodb.odm.search_filter',
12121216
'api_platform.doctrine_mongodb.odm.boolean_filter',
12131217
'api_platform.doctrine_mongodb.odm.date_filter',
@@ -1232,7 +1236,11 @@ public function testDoctrineMongoDbOdmConfiguration(): void
12321236
];
12331237

12341238
$aliases = [
1235-
// doctrine_mongo_odm.xml
1239+
// doctrine_mongodb_odm.xml
1240+
RemoveProcessor::class,
1241+
PersistProcessor::class,
1242+
MongoDbCollectionProvider::class,
1243+
MongoDbItemProvider::class,
12361244
'ApiPlatform\Doctrine\Odm\Filter\SearchFilter',
12371245
'ApiPlatform\Doctrine\Odm\Filter\BooleanFilter',
12381246
'ApiPlatform\Doctrine\Odm\Filter\DateFilter',
@@ -1247,11 +1255,10 @@ public function testDoctrineMongoDbOdmConfiguration(): void
12471255

12481256
$this->assertContainerHas($services, $aliases);
12491257

1250-
$this->assertServiceHasTags(RemoveProcessor::class, ['api_platform.state_processor']);
1251-
$this->assertServiceHasTags(PersistProcessor::class, ['api_platform.state_processor']);
1252-
$this->assertServiceHasTags(MongoDbCollectionProvider::class, ['api_platform.state_provider']);
1253-
$this->assertServiceHasTags(MongoDbItemProvider::class, ['api_platform.state_provider']);
1254-
// doctrine_mongo_odm.xml
1258+
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.remove_processor', ['api_platform.state_processor']);
1259+
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.persist_processor', ['api_platform.state_processor']);
1260+
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.collection_provider', ['api_platform.state_provider']);
1261+
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.state.item_provider', ['api_platform.state_provider']);
12551262
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.default_document_manager.property_info_extractor', ['property_info.list_extractor', 'property_info.type_extractor']);
12561263
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.filter', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);
12571264
$this->assertServiceHasTags('api_platform.doctrine_mongodb.odm.aggregation_extension.pagination', ['api_platform.doctrine_mongodb.odm.aggregation_extension.collection']);

0 commit comments

Comments
 (0)