Merge pull request #1006 from schmittjoh/context-methods

Move serialization info to the serialization context class

Author: goetas

src/Context.php

@@ -46,11 +46,6 @@ abstract class Context
     /** @var DisjunctExclusionStrategy */
     private $exclusionStrategy;
 
-    /**
-     * @var bool
-     */
-    private $serializeNull = false;
-
     /**
      * @var bool
      */
@@ -193,25 +188,6 @@ public function enableMaxDepthChecks(): self
         return $this;
     }
 
-    /**
-     * Set if NULLs should be serialized (TRUE) ot not (FALSE)
-     */
-    public function setSerializeNull(bool $bool): self
-    {
-        $this->serializeNull = $bool;
-
-        return $this;
-    }
-
-    /**
-     * Returns TRUE when NULLs should be serialized
-     * Returns FALSE when NULLs should not be serialized
-     */
-    public function shouldSerializeNull(): bool
-    {
-        return $this->serializeNull;
-    }
-
     public function getFormat(): string
     {
         return $this->format;

src/SerializationContext.php

@@ -20,6 +20,11 @@ class SerializationContext extends Context
      */
     private $initialType;
 
+    /**
+     * @var bool
+     */
+    private $serializeNull = false;
+
     public static function create(): self
     {
         return new self();
@@ -33,6 +38,25 @@ public function initialize(string $format, VisitorInterface $visitor, GraphNavig
         $this->visitingStack = new \SplStack();
     }
 
+    /**
+     * Set if NULLs should be serialized (TRUE) ot not (FALSE)
+     */
+    public function setSerializeNull(bool $bool): self
+    {
+        $this->serializeNull = $bool;
+
+        return $this;
+    }
+
+    /**
+     * Returns TRUE when NULLs should be serialized
+     * Returns FALSE when NULLs should not be serialized
+     */
+    public function shouldSerializeNull(): bool
+    {
+        return $this->serializeNull;
+    }
+
     /**
      * @param mixed $object
      */

tests/Serializer/BaseSerializationTest.php

@@ -726,7 +726,7 @@ public function testDeserializingNull()
         self::assertEquals($this->getContent('blog_post_unauthored'), $this->serialize($post, SerializationContext::create()->setSerializeNull(true)));
 
         if ($this->hasDeserializer()) {
-            $deserialized = $this->deserialize($this->getContent('blog_post_unauthored'), get_class($post), DeserializationContext::create()->setSerializeNull(true));
+            $deserialized = $this->deserialize($this->getContent('blog_post_unauthored'), get_class($post), DeserializationContext::create());
 
             self::assertEquals('2011-07-30T00:00:00+00:00', $this->getField($deserialized, 'createdAt')->format(\DateTime::ATOM));
             self::assertAttributeEquals('This is a nice title.', 'title', $deserialized);

tests/Serializer/GraphNavigatorTest.php

@@ -32,6 +32,7 @@ class GraphNavigatorTest extends TestCase
     private $serializationNavigator;
     private $deserializationNavigator;
     private $context;
+    private $deserializationContext;
     private $accessor;
 
     private $serializationVisitor;
@@ -140,6 +141,11 @@ protected function setUp()
             ->setMethodsExcept(['getExclusionStrategy'])
             ->getMock();
 
+        $this->deserializationContext = $this->getMockBuilder(DeserializationContext::class)
+            ->enableOriginalConstructor()
+            ->setMethodsExcept(['getExclusionStrategy'])
+            ->getMock();
+
         $this->dispatcher = new EventDispatcher();
         $this->accessor = new DefaultAccessorStrategy();
         $this->handlerRegistry = new HandlerRegistry();
@@ -151,7 +157,7 @@ protected function setUp()
         $this->serializationNavigator->initialize($this->serializationVisitor, $this->context);
 
         $this->deserializationNavigator = new DeserializationGraphNavigator($this->metadataFactory, $this->handlerRegistry, $this->objectConstructor, $this->accessor, $this->dispatcher);
-        $this->deserializationNavigator->initialize($this->deserializationVisitor, $this->context);
+        $this->deserializationNavigator->initialize($this->deserializationVisitor, $this->deserializationContext);
     }
 }