Merge pull request #967 from schmittjoh/2.0-compat

Serializer 2.0 compatibility features

composer.json

@@ -61,7 +61,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-1.x": "1.11-dev"
+            "dev-1.x": "1.13-dev"
         }
     }
 }

src/JMS/Serializer/Context.php

@@ -17,6 +17,7 @@
 abstract class Context
 {
     /**
+     * @deprecated use has/get/set attribute methods
      * @var \PhpCollection\Map
      */
     public $attributes;
@@ -96,6 +97,16 @@ public function getExclusionStrategy()
         return $this->exclusionStrategy;
     }
 
+    public function hasAttribute($key)
+    {
+        return $this->attributes->get($key)->isDefined();
+    }
+
+    public function getAttribute($key)
+    {
+        return $this->attributes->get($key)->get();
+    }
+
     public function setAttribute($key, $value)
     {
         $this->assertMutable();

src/JMS/Serializer/GraphNavigator.php

@@ -26,9 +26,6 @@
  */
 final class GraphNavigator implements GraphNavigatorInterface
 {
-    const DIRECTION_SERIALIZATION = 1;
-    const DIRECTION_DESERIALIZATION = 2;
-
     /**
      * @var ExpressionLanguageExclusionStrategy
      */

src/JMS/Serializer/GraphNavigatorInterface.php

@@ -12,6 +12,8 @@
  */
 interface GraphNavigatorInterface
 {
+    const DIRECTION_SERIALIZATION = 1;
+    const DIRECTION_DESERIALIZATION = 2;
     /**
      * Called for each node of the graph that is being traversed.
      *

src/JMS/Serializer/XmlSerializationVisitor.php

@@ -361,8 +361,18 @@ public function getCurrentMetadata()
         return $this->currentMetadata;
     }
 
+    /**
+     * @param bool $create (default = false)
+     * @return \DOMDocument
+     */
     public function getDocument()
     {
+        if (func_num_args() === 1) {
+            if (null === $this->document && func_get_arg(0) === true) {
+                $this->document = $this->createDocument();
+            }
+        }
+
         return $this->document;
     }
 
@@ -388,6 +398,13 @@ public function revertCurrentMetadata()
         return $this->currentMetadata = $this->metadataStack->pop();
     }
 
+    /**
+     * @deprecated Use $this->getDocument(true) instead
+     * @param null $version
+     * @param null $encoding
+     * @param bool $addRoot
+     * @return \DOMDocument
+     */
     public function createDocument($version = null, $encoding = null, $addRoot = true)
     {
         $doc = new \DOMDocument($version ?: $this->defaultVersion, $encoding ?: $this->defaultEncoding);