Merge pull request #582 from FriendsOfSymfony/fix_573

lsmith77 · lsmith77 · commit e3b58653299f · 2013-10-09T23:03:53.000-07:00
only call setSerializeNull if its not yet explicitly set
diff --git a/View/ViewHandler.php b/View/ViewHandler.php
@@ -215,8 +215,10 @@ public function getSerializationContext(View $view)
             }
         }
 
-        $serializeNull = $this->container->getParameter('fos_rest.serializer.serialize_null');
-        $context->setSerializeNull($serializeNull);
+        if (null === $context->shouldSerializeNull()) {
+            $serializeNull = $this->container->getParameter('fos_rest.serializer.serialize_null');
+            $context->setSerializeNull($serializeNull);
+        }
 
         return $context;
     }

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,10 @@ public function getSerializationContext(View $view)`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`- $serializeNull = $this->container->getParameter('fos_rest.serializer.serialize_null');`
`219`		`- $context->setSerializeNull($serializeNull);`
	`218`	`+ if (null === $context->shouldSerializeNull()) {`
	`219`	`+ $serializeNull = $this->container->getParameter('fos_rest.serializer.serialize_null');`
	`220`	`+ $context->setSerializeNull($serializeNull);`
	`221`	`+ }`
`220`	`222`
`221`	`223`	`return $context;`
`222`	`224`	`}`