Fixes

GuilhemN · GuilhemN · commit 484f09150028 · 2017-03-21T19:02:02.000+01:00
diff --git a/src/Symfony/Component/Serializer/Dumper/NormalizerDumper.php b/src/Symfony/Component/Serializer/Dumper/NormalizerDumper.php
@@ -151,7 +151,7 @@ private function generateNormalizeMethodInner(\ReflectionClass $reflectionClass)
                     \$subContext['attributes'] = \$context['attributes']['{$attributeMetadata->name}'];
                 }
 
-                \$output['{$attributeMetadata->name}'] = \$this->normalizer->normalize({$value}, \$format, \$context);
+                \$output['{$attributeMetadata->name}'] = \$this->normalizer->normalize({$value}, \$format, \$subContext);
             }
         }
 EOL;
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -55,9 +55,8 @@ protected function setUp()
     protected function getNormalizerFor($class)
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $dumper = new NormalizerDumper($classMetadataFactory);
 
-        $normalizer = new ObjectNormalizer();
+        $normalizer = new ObjectNormalizer($classMetadataFactory);
         $normalizer->setSerializer($this->serializer);
 
         return $normalizer;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private function generateNormalizeMethodInner(\ReflectionClass $reflectionClass)`
`151`	`151`	`\$subContext['attributes'] = \$context['attributes']['{$attributeMetadata->name}'];`
`152`	`152`	`}`
`153`	`153`
`154`		`- \$output['{$attributeMetadata->name}'] = \$this->normalizer->normalize({$value}, \$format, \$context);`
	`154`	`+ \$output['{$attributeMetadata->name}'] = \$this->normalizer->normalize({$value}, \$format, \$subContext);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`EOL;`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,8 @@ protected function setUp()`
`55`	`55`	`protected function getNormalizerFor($class)`
`56`	`56`	`{`
`57`	`57`	`$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
`58`		`- $dumper = new NormalizerDumper($classMetadataFactory);`
`59`	`58`
`60`		`- $normalizer = new ObjectNormalizer();`
	`59`	`+ $normalizer = new ObjectNormalizer($classMetadataFactory);`
`61`	`60`	`$normalizer->setSerializer($this->serializer);`
`62`	`61`
`63`	`62`	`return $normalizer;`