Skip to content

fix: replace FQCN service names by snake ones #5019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2022
Merged

fix: replace FQCN service names by snake ones #5019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.7.1

* Replace FQCN service names by snake ones (#5019)

## 2.7.0

* chore: remove @experimental phpdoc (#4933)
Expand Down
16 changes: 6 additions & 10 deletions src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
10 changes: 6 additions & 4 deletions src/Symfony/Bundle/Resources/config/doctrine_orm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 6 additions & 4 deletions src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
10 changes: 6 additions & 4 deletions src/Symfony/Bundle/Resources/config/v3/doctrine_orm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/Resources/config/v3/state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand All @@ -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>
Expand Down
45 changes: 26 additions & 19 deletions tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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']);
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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']);
Expand Down