symfony
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+10Lines changed: 10 additions & 0 deletions
@@ -402,6 +402,8 @@ protected function createChildContext(array $parentContext, $attribute)
     {
         if (isset($parentContext[self::ATTRIBUTES][$attribute])) {
             $parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute];
+        } else {
+            unset($parentContext[self::ATTRIBUTES]);
         }
 
         return $parentContext;
 
@@ -673,6 +673,16 @@ public function testAttributesContextNormalize()
             ),
             $serializer->normalize($objectDummy, null, $context)
         );
+
+        $context = array('attributes' => array('foo', 'baz', 'object'));
+        $this->assertEquals(
+            array(
+                'foo' => 'foo',
+                'baz' => true,
+                'object' => array('foo' => 'innerFoo', 'bar' => 'innerBar'),
+            ),
+            $serializer->normalize($objectDummy, null, $context)
+        );
     }
 
     public function testAttributesContextDenormalize()
Original file line number	Diff line number	Diff line change
`@@ -402,6 +402,8 @@ protected function createChildContext(array $parentContext, $attribute)`
`402`	`402`	`{`
`403`	`403`	`if (isset($parentContext[self::ATTRIBUTES][$attribute])) {`
`404`	`404`	`$parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute];`
	`405`	`+ } else {`
	`406`	`+ unset($parentContext[self::ATTRIBUTES]);`
`405`	`407`	`}`
`406`	`408`
`407`	`409`	`return $parentContext;`