Skip to content

Commit ecc6cf1

Browse files
Merge branch '3.4'
* 3.4: [DI] Handle container.autowiring.strict_mode to opt-out from legacy autowiring [2.8] Fix some docblocks Escape trailing \ in QuestionHelper autocompletion [FrameworkBundle][Serializer] Remove outdated condition Add "doctrine/annotations" to top-level composer.json Fix phpdoc inconsistencies, simplify no-op sprintf. Remove inapplicable phpdoc comment nit: Fix phpdoc inconsistency and unreachable statement [DI] Register default env var provided types Fix phpdoc and unnecessary sprintf [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command [Security] Fix BC layer for AbstractGuardAuthenticator subclasses Prefer line formatter on missing cli dumper [DI] Enhance service locator error message
2 parents 1956be0 + c6657d6 commit ecc6cf1

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Normalizer/AbstractObjectNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function normalize($object, $format = null, array $context = array())
110110
*
111111
* @return string[]
112112
*/
113-
protected function getAttributes($object, $format = null, array $context)
113+
protected function getAttributes($object, $format, array $context)
114114
{
115115
$class = get_class($object);
116116
$key = $class.'-'.$context['cache_key'];

Tests/Encoder/ChainEncoderTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Serializer\Encoder\ChainEncoder;
16+
use Symfony\Component\Serializer\Encoder\EncoderInterface;
1617
use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
1718

1819
class ChainEncoderTest extends TestCase
@@ -123,10 +124,14 @@ class ChainNormalizationAwareEncoder extends ChainEncoder implements Normalizati
123124
{
124125
}
125126

126-
class NormalizationAwareEncoder implements NormalizationAwareInterface
127+
class NormalizationAwareEncoder implements EncoderInterface, NormalizationAwareInterface
127128
{
128129
public function supportsEncoding($format)
129130
{
130131
return true;
131132
}
133+
134+
public function encode($data, $format, array $context = array())
135+
{
136+
}
132137
}

0 commit comments

Comments
 (0)