Skip to content

Commit 6e9014e

Browse files
authored
Merge pull request #2648 from api-platform/revert-2629-fix/cache-in-dev
Revert "Do not disable cache in dev"
2 parents 61c24bf + bac8096 commit 6e9014e

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -436,21 +436,17 @@ private function registerBundlesConfiguration(array $bundles, array $config, Xml
436436
*/
437437
private function registerCacheConfiguration(ContainerBuilder $container)
438438
{
439-
if (!$container->hasParameter('api_platform.metadata_cache')) {
439+
// Don't use system cache pool in dev
440+
if ($container->hasParameter('api_platform.metadata_cache') ? $container->getParameter('api_platform.metadata_cache') : !$container->getParameter('kernel.debug')) {
440441
return;
441442
}
442443

443-
@trigger_error('The "api_platform.metadata_cache" parameter is deprecated since version 2.4 and will have no effect in 3.0.', E_USER_DEPRECATED);
444-
445-
// BC
446-
if (!$container->getParameter('api_platform.metadata_cache')) {
447-
$container->register('api_platform.cache.metadata.property', ArrayAdapter::class);
448-
$container->register('api_platform.cache.metadata.resource', ArrayAdapter::class);
449-
$container->register('api_platform.cache.route_name_resolver', ArrayAdapter::class);
450-
$container->register('api_platform.cache.identifiers_extractor', ArrayAdapter::class);
451-
$container->register('api_platform.cache.subresource_operation_factory', ArrayAdapter::class);
452-
$container->register('api_platform.elasticsearch.cache.metadata.document', ArrayAdapter::class);
453-
}
444+
$container->register('api_platform.cache.metadata.property', ArrayAdapter::class);
445+
$container->register('api_platform.cache.metadata.resource', ArrayAdapter::class);
446+
$container->register('api_platform.cache.route_name_resolver', ArrayAdapter::class);
447+
$container->register('api_platform.cache.identifiers_extractor', ArrayAdapter::class);
448+
$container->register('api_platform.cache.subresource_operation_factory', ArrayAdapter::class);
449+
$container->register('api_platform.elasticsearch.cache.metadata.document', ArrayAdapter::class);
454450
}
455451

456452
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,8 @@ private function getBaseContainerBuilderProphecy()
10351035
$containerBuilderProphecy->setAlias($alias, $service)->shouldBeCalled();
10361036
}
10371037

1038-
$containerBuilderProphecy->hasParameter('api_platform.metadata_cache')->willReturn(false);
1038+
$containerBuilderProphecy->hasParameter('api_platform.metadata_cache')->willReturn(true)->shouldBeCalled();
1039+
$containerBuilderProphecy->getParameter('api_platform.metadata_cache')->willReturn(true)->shouldBeCalled();
10391040

10401041
$containerBuilderProphecy->getDefinition('api_platform.mercure.listener.response.add_link_header')->willReturn(new Definition());
10411042

tests/Fixtures/app/config/config_common.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ api_platform:
8989
parameters:
9090
container.autowiring.strict_mode: true
9191
container.dumper.inline_class_loader: true
92+
# Enable the metadata cache to speedup the builds
93+
api_platform.metadata_cache: true
9294

9395
services:
9496
contain_non_resource.item_data_provider:

0 commit comments

Comments
 (0)