Skip to content

Commit 5efbaf1

Browse files
Merge branch '6.4' into 7.0
* 6.4: [Serializer] Remove TranslatableNormalizer service when the Translator is disabled Fix support to denormalize plain object types [Routing] Restore aliases removal in RouteCollection::remove() [Workflow] Add `getEnabledTransition()` to TraceableWorkflow [DependencyInjection] Fix parsing named autowiring aliases that contain underscores [Console] Add Les-Tilleuls.coop as sponsor of version 6.4/7.0 remove duplicated service definition
2 parents 60ecfb6 + 5305c90 commit 5efbaf1

File tree

5 files changed

+46
-1
lines changed

5 files changed

+46
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
18571857
$container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
18581858
}
18591859

1860-
if (!class_exists(Translator::class)) {
1860+
if (!$this->readConfigEnabled('translator', $container, $config)) {
18611861
$container->removeDefinition('serializer.normalizer.translatable');
18621862
}
18631863

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'serializer' => [
9+
'enabled' => true,
10+
],
11+
'translator' => [
12+
'enabled' => false,
13+
],
14+
]);
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns:framework="http://symfony.com/schema/dic/symfony"
6+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
7+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
8+
9+
<framework:config secret="s3cr3t" http-method-override="false" handle-all-throwables="true">
10+
<framework:annotations enabled="false" />
11+
<framework:php-errors log="true" />
12+
<framework:serializer enabled="true" />
13+
<framework:translator enabled="false" />
14+
</framework:config>
15+
</container>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
framework:
2+
annotations: false
3+
http_method_override: false
4+
handle_all_throwables: true
5+
php_errors:
6+
log: true
7+
serializer:
8+
enabled: true
9+
translator:
10+
enabled: false

Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,12 @@ public function testSerializerEnabled()
14341434
$this->assertEquals($container->getDefinition('serializer.normalizer.object')->getArgument(6)['max_depth_handler'], new Reference('my.max.depth.handler'));
14351435
}
14361436

1437+
public function testSerializerWithoutTranslator()
1438+
{
1439+
$container = $this->createContainerFromFile('serializer_without_translator');
1440+
$this->assertFalse($container->hasDefinition('serializer.normalizer.translatable'));
1441+
}
1442+
14371443
public function testRegisterSerializerExtractor()
14381444
{
14391445
$container = $this->createContainerFromFile('full');

0 commit comments

Comments
 (0)