Skip to content

Commit a3ebda4

Browse files
committed
Merge branch 'master' of github.com:api-platform/core
2 parents c450854 + e2f3629 commit a3ebda4

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"symfony/config": "^3.3 || ^4.0",
5151
"symfony/console": "^3.3 || ^4.0",
5252
"symfony/debug": "^2.8 || ^3.0 || ^4.0",
53-
"symfony/dependency-injection": "^3.3@dev",
53+
"symfony/dependency-injection": "^3.3@dev || ^4.0@dev",
5454
"symfony/doctrine-bridge": "^2.8.12 || ^3.0 || ^4.0",
5555
"symfony/event-dispatcher": "^3.3 || ^4.0",
5656
"symfony/expression-language": "^2.8 || ^3.0 || ^4.0",

src/Bridge/Symfony/Bundle/Resources/config/data_persister.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<services>
88
<service id="api_platform.data_persister" class="ApiPlatform\Core\DataPersister\ChainDataPersister" public="false" />
9+
<service id="ApiPlatform\Core\DataPersister\DataPersisterInterface" alias="api_platform.data_persister" />
910
</services>
1011

1112
</container>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ private function getPartialContainerBuilderProphecy()
487487
CollectionDataProviderInterface::class => 'api_platform.collection_data_provider',
488488
ItemDataProviderInterface::class => 'api_platform.item_data_provider',
489489
SubresourceDataProviderInterface::class => 'api_platform.subresource_data_provider',
490+
DataPersisterInterface::class => 'api_platform.data_persister',
490491
];
491492

492493
foreach ($aliases as $alias => $service) {

tests/Fixtures/app/config/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ nelmio_api_doc:
8888
json: 'application/json'
8989

9090
parameters:
91-
#container.autowiring.strict_mode: true
91+
container.autowiring.strict_mode: true
9292
container.dumper.inline_class_loader: true
9393

9494
services:

0 commit comments

Comments
 (0)