Skip to content

Commit 4c070b0

Browse files
committed
fix references & test
1 parent 48f0034 commit 4c070b0

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

src/Core/Bridge/Symfony/Bundle/Resources/config/api.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,18 +262,18 @@
262262

263263
<!-- Action -->
264264

265-
<service id="api_platform.action.placeholder" class="ApiPlatform\Core\Action\PlaceholderAction" public="true" />
265+
<service id="api_platform.action.placeholder" class="ApiPlatform\Action\PlaceholderAction" public="true" />
266266
<service id="api_platform.action.get_collection" alias="api_platform.action.placeholder" public="true" />
267267
<service id="api_platform.action.post_collection" alias="api_platform.action.placeholder" public="true" />
268268
<service id="api_platform.action.get_item" alias="api_platform.action.placeholder" public="true" />
269269
<service id="api_platform.action.patch_item" alias="api_platform.action.placeholder" public="true" />
270270
<service id="api_platform.action.put_item" alias="api_platform.action.placeholder" public="true" />
271271
<service id="api_platform.action.delete_item" alias="api_platform.action.placeholder" public="true" />
272272
<service id="api_platform.action.get_subresource" alias="api_platform.action.placeholder" public="true" />
273-
<service id="api_platform.action.not_found" class="ApiPlatform\Core\Action\NotFoundAction" public="true" />
274-
<service id="ApiPlatform\Core\Action\NotFoundAction" alias="api_platform.action.not_found" public="true" />
273+
<service id="api_platform.action.not_found" class="ApiPlatform\Action\NotFoundAction" public="true" />
274+
<service id="ApiPlatform\Action\NotFoundAction" alias="api_platform.action.not_found" public="true" />
275275

276-
<service id="api_platform.action.entrypoint" class="ApiPlatform\Core\Action\EntrypointAction" public="true">
276+
<service id="api_platform.action.entrypoint" class="ApiPlatform\Action\EntrypointAction" public="true">
277277
<argument type="service" id="api_platform.metadata.resource.name_collection_factory" />
278278
</service>
279279

@@ -287,7 +287,7 @@
287287
<argument type="service" id="api_platform.openapi.factory.next" on-invalid="null"></argument>
288288
</service>
289289

290-
<service id="api_platform.action.exception" class="ApiPlatform\Core\Action\ExceptionAction" public="true">
290+
<service id="api_platform.action.exception" class="ApiPlatform\Action\ExceptionAction" public="true">
291291
<argument type="service" id="api_platform.serializer" />
292292
<argument>%api_platform.error_formats%</argument>
293293
<argument>%api_platform.exception_to_status%</argument>

src/Core/Bridge/Symfony/Bundle/Resources/config/validator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<argument type="service" id="validator" />
1010
<argument type="service" id="service_container" />
1111
</service>
12-
<service id="ApiPlatform\Validator\ValidatorInterface" alias="api_platform.validator" />
12+
<service id="ApiPlatform\Symfony\EventListener\ValidatorInterface" alias="api_platform.validator" />
1313

1414
<service id="api_platform.metadata.property.metadata_factory.validator" class="ApiPlatform\Core\Bridge\Symfony\Validator\Metadata\Property\ValidatorPropertyMetadataFactory" decorates="api_platform.metadata.property.metadata_factory" decoration-priority="20" public="false">
1515
<argument type="service" id="validator" />

src/deprecation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
// Action
111111
ApiPlatform\Core\Action\EntrypointAction::class => ApiPlatform\Action\EntrypointAction::class,
112112
ApiPlatform\Core\Action\ExceptionAction::class => ApiPlatform\Action\ExceptionAction::class,
113-
ApiPlatform\Core\Action\NotfoundAction::class => ApiPlatform\Action\NotFoundAction::class,
113+
ApiPlatform\Core\Action\NotFoundAction::class => ApiPlatform\Action\NotFoundAction::class,
114114
ApiPlatform\Core\Action\PlaceholderAction::class => ApiPlatform\Action\PlaceholderAction::class,
115115

116116
// Bridge

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,9 +1209,9 @@ private function getPartialContainerBuilderProphecy($configuration = null)
12091209
}
12101210

12111211
// Find missing aliases
1212-
// $containerBuilderProphecy->setAlias(Argument::type('string'), Argument::type(Alias::class))->will(function ($args) {
1213-
// echo "Alias: '{$args[0]}' => '{$args[1]}',".\PHP_EOL;
1214-
// });
1212+
$containerBuilderProphecy->setAlias(Argument::type('string'), Argument::type(Alias::class))->will(function ($args) {
1213+
echo "Alias: '{$args[0]}' => '{$args[1]}',".\PHP_EOL;
1214+
});
12151215

12161216
$containerBuilderProphecy->getParameter('kernel.project_dir')->willReturn(__DIR__.'/../../../../../Fixtures/app');
12171217
$containerBuilderProphecy->getParameter('kernel.debug')->willReturn(false);
@@ -1228,6 +1228,17 @@ private function getPartialContainerBuilderProphecy($configuration = null)
12281228
$containerBuilderProphecy->getAlias(Argument::type('string'))
12291229
->willReturn($this->prophesize(Alias::class)->reveal());
12301230

1231+
$deprecatedInterfaces = include __DIR__.'/../../../../../../src/deprecated_interfaces.php';
1232+
foreach ($deprecatedInterfaces as $oldInterface => $newInterface) {
1233+
$containerBuilderProphecy->hasAlias($oldInterface)->shouldBeCalled()->willReturn(false);
1234+
$containerBuilderProphecy->hasAlias($newInterface)->shouldBeCalled()->willReturn(true);
1235+
$containerBuilderProphecy->setAlias($oldInterface, $newInterface)->shouldBeCalled();
1236+
1237+
$definitionProphecy = $this->prophesize(Definition::class);
1238+
$definitionProphecy->setDeprecated('api-platform/core', '2.7', Argument::type('string'))->shouldBeCalled();
1239+
$containerBuilderProphecy->getDefinition($oldInterface)->shouldBeCalled()->willReturn($definitionProphecy->reveal());
1240+
}
1241+
12311242
return $containerBuilderProphecy;
12321243
}
12331244

0 commit comments

Comments
 (0)