Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit cb97c0e

Browse filesBrowse files
committed
Merge branch '6.4' into 7.0
* 6.4: fix merge fix syntax for PHP 7.2 [Security] Fix Danish translations [Messenger] Improve deadlock handling on `ack()` and `reject()` [DomCrawler] Encode html entities only if nessecary [Serializer] reset backed_enum priority, and re-prioritise translatable [Validator] Accept `Stringable` in `ExecutionContext::build/addViolation()` [Serializer] Ignore when using #[Ignore] on a non-accessor [Filesystem] Strengthen the check of file permissions in `dumpFile` [Serializer] Fix XML scalar to object denormalization [HttpClient][EventSourceHttpClient] Fix consuming SSEs with \r\n separator
2 parents b5a08d1 + d17b520 commit cb97c0e
Copy full SHA for cb97c0e

File tree

Expand file treeCollapse file tree

2 files changed

+18
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+18
-3
lines changed

‎Resources/config/serializer.php

Copy file name to clipboardExpand all lines: Resources/config/serializer.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115

116116
->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
117117
->args(['$translator' => service('translator')])
118-
->tag('serializer.normalizer', ['priority' => -890])
118+
->tag('serializer.normalizer', ['priority' => -920])
119119

120120
->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
121121
->tag('serializer.normalizer', ['priority' => -915])
@@ -212,6 +212,6 @@
212212
])
213213

214214
->set('serializer.normalizer.backed_enum', BackedEnumNormalizer::class)
215-
->tag('serializer.normalizer', ['priority' => -880])
215+
->tag('serializer.normalizer', ['priority' => -915])
216216
;
217217
};

‎Tests/DependencyInjection/FrameworkExtensionTestCase.php

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/FrameworkExtensionTestCase.php
+16-1Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
6767
use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
6868
use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
69+
use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
6970
use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
7071
use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
7172
use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
@@ -1539,10 +1540,24 @@ public function testTranslatableNormalizerRegistered()
15391540
$tag = $definition->getTag('serializer.normalizer');
15401541

15411542
$this->assertSame(TranslatableNormalizer::class, $definition->getClass());
1542-
$this->assertSame(-890, $tag[0]['priority']);
1543+
$this->assertSame(-920, $tag[0]['priority']);
15431544
$this->assertEquals(new Reference('translator'), $definition->getArgument('$translator'));
15441545
}
15451546

1547+
/**
1548+
* @see https://github.com/symfony/symfony/issues/54478
1549+
*/
1550+
public function testBackedEnumNormalizerRegistered()
1551+
{
1552+
$container = $this->createContainerFromFile('full');
1553+
1554+
$definition = $container->getDefinition('serializer.normalizer.backed_enum');
1555+
$tag = $definition->getTag('serializer.normalizer');
1556+
1557+
$this->assertSame(BackedEnumNormalizer::class, $definition->getClass());
1558+
$this->assertSame(-915, $tag[0]['priority']);
1559+
}
1560+
15461561
public function testSerializerCacheActivated()
15471562
{
15481563
$container = $this->createContainerFromFile('serializer_enabled');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.