Skip to content

Commit 34649fa

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpKernel] Fix test sensitivity on xdebug.file_link_format [HttpKernel] Fix non-scalar check in surrogate fragment renderer [HtmlSanitizer] Allow null for sanitizer option `allowed_link_hosts` and `allowed_media_hosts` [Serializer] Fix wrong needsNormalization in TraceableEncoder [Debug][ErrorHandler] fix operator precedence [Cache] Ensured that redis adapter can use multiple redis sentinel hosts [DoctrineBridge] fix tests [Security] Allow redirect after login to absolute URLs
2 parents cc64a2f + 2c59be3 commit 34649fa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Debug/TraceableEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
1515
use Symfony\Component\Serializer\Encoder\DecoderInterface;
1616
use Symfony\Component\Serializer\Encoder\EncoderInterface;
17+
use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
1718
use Symfony\Component\Serializer\SerializerAwareInterface;
1819
use Symfony\Component\Serializer\SerializerInterface;
19-
use Symfony\Component\Serializer\Tests\Encoder\NormalizationAwareEncoder;
2020

2121
/**
2222
* Collects some data about encoding.
@@ -111,7 +111,7 @@ public function setSerializer(SerializerInterface $serializer)
111111

112112
public function needsNormalization(): bool
113113
{
114-
return !$this->encoder instanceof NormalizationAwareEncoder;
114+
return !$this->encoder instanceof NormalizationAwareInterface;
115115
}
116116

117117
/**

0 commit comments

Comments
 (0)