Skip to content

[FrameworkBundle] enable metadata cache when annotation is disabled #49679

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
nicolas-grekas merged 1 commit into from
Mar 31, 2023
+49 −5
Merged

[FrameworkBundle] enable metadata cache when annotation is disabled #49679

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
6 changes: 3 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,9 +1777,6 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
{
$loader->load('serializer.php');
if ($container->getParameter('kernel.debug')) {
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
}

$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');

Expand All @@ -1805,6 +1802,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
if (\PHP_VERSION_ID < 80000 && !$this->annotationsConfigEnabled) {
throw new \LogicException('"enable_annotations" on the serializer cannot be set as the PHP version is lower than 8 and Annotations support is disabled. Consider upgrading PHP.');
}
if ($container->getParameter('kernel.debug')) {
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
}

$annotationLoader = new Definition(
'Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader',
Expand Down
14 changes: 14 additions & 0 deletions ...kBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping_without_annotations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

$container->loadFromExtension('framework', [
'serializer' => [
'enable_annotations' => false,
'mapping' => [
'paths' => [
'%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
'%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
'%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
],
],
],
]);
16 changes: 16 additions & 0 deletions ...kBundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping_without_annotations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" ?>

<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony">

<framework:config>
<framework:serializer enable-annotations="false">
<framework:mapping>
<framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>
<framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml</framework:path>
<framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml</framework:path>
</framework:mapping>
</framework:serializer>
</framework:config>
</container>
8 changes: 8 additions & 0 deletions ...kBundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping_without_annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
framework:
serializer:
enable_annotations: false
mapping:
paths:
- "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files"
- "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml"
- "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml"
10 changes: 8 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,9 +1529,15 @@ public function testSerializerCacheActivated()
$this->assertEquals(new Reference('serializer.mapping.cache.symfony'), $cache);
}

public function testSerializerCacheNotActivatedDebug()
public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()
{
$container = $this->createContainerFromFile('serializer_enabled', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
}

public function testSerializerCacheNotActivatedWithAnnotations()
{
$container = $this->createContainerFromFile('serializer_mapping', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
}

Expand Down