Merge pull request #694 from schmittjoh/context-factory-v2

setSerializeNull option is available only on the serialization context
schmittjoh · Nov 9, 2018 · 1ea6bf7 · 1ea6bf7
2 parents 017a85e + 5e01617
commit 1ea6bf7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ContextFactory/ConfiguredContextFactory.php b/ContextFactory/ConfiguredContextFactory.php
@@ -116,7 +116,8 @@ private function configureContext(Context $context)
         if (!empty($this->groups)) {
             $context->setGroups($this->groups);
         }
-        if ($this->serializeNulls !== null) {
+
+        if (($context instanceof SerializationContext) && $this->serializeNulls !== null) {
             $context->setSerializeNull($this->serializeNulls);
         }
 

diff --git a/Tests/ContextFactory/ConfiguredContextFactoryTest.php b/Tests/ContextFactory/ConfiguredContextFactoryTest.php
@@ -3,6 +3,7 @@
 namespace JMS\SerializerBundle\Tests\ContextFactory;
 
 use JMS\Serializer\Context;
+use JMS\Serializer\SerializationContext;
 use JMS\SerializerBundle\ContextFactory\ConfiguredContextFactory;
 use PHPUnit\Framework\TestCase;
 
@@ -47,7 +48,9 @@ public function testCreateSerializationContext(
         $context = $object->$factoryMethod();
         /** @var Context $context */
         $this->assertInstanceOf($expectedContextClass, $context);
-        $this->assertSame($serializeNulls, $context->shouldSerializeNull());
+        if ($context instanceof SerializationContext) {
+            $this->assertSame($serializeNulls, $context->shouldSerializeNull());
+        }
 
         $this->assertSame($version, $context->getAttribute('version'));
         $this->assertSame($groups, $context->getAttribute('groups'));