Make ContentState JsonSerializable

README.md

@@ -139,6 +139,8 @@ var_dump($contentState->getEntity($contentState->blocks[0]->characterList[0]->en
 $contentState = \Prezly\DraftPhp\Converter::convertFromJson($json);
 
 $serializedJson = \Prezly\DraftPhp\Serializer::serialize($contentState);
+// or
+$serializedJson = json_serialize($contentState); 
 
 // now $json is equivalent to $serializedJson (formatting and order may differ though)
 // see SerializerTest for examples

lib/Model/ContentState.php

@@ -3,13 +3,15 @@
 namespace Prezly\DraftPhp\Model;
 
 use InvalidArgumentException;
+use JsonSerializable;
 use Prezly\DraftPhp\Constants\BlockType;
+use Prezly\DraftPhp\Serializer;
 
 /**
  * @property ContentBlock[] $blocks
  * @property EntityInstance[] $entityMap
  */
-class ContentState
+class ContentState implements JsonSerializable
 {
     /** @var ContentBlock[] */
     private $_blocks;
@@ -80,4 +82,16 @@ public function __get($name)
         // public read-only access to private properties
         return $this->{'_' . $name};
     }
+
+    /**
+     * @return RawDraftContentState|\stdClass
+     */
+    public function jsonSerialize()
+    {
+        $serializer = new Serializer();
+
+        $rawContentState = $serializer->serializeRaw($this);
+
+        return $rawContentState;
+    }
 }

lib/Serializer.php

@@ -19,16 +19,16 @@ public static function serialize(ContentState $contentState, int $options = 0):
     {
         $serializer = new self();
 
-        $rawContentState = $serializer ->serializeContentState($contentState);
+        $rawContentState = $serializer->serializeRaw($contentState);
 
         return json_encode($rawContentState, $options);
     }
 
     /**
      * @param ContentState $contentState
-     * @return \Prezly\DraftPhp\Model\RawDraftContentState
+     * @return \stdClass|\Prezly\DraftPhp\Model\RawDraftContentState
      */
-    private function serializeContentState(ContentState $contentState)
+    public function serializeRaw(ContentState $contentState): \stdClass
     {
         /**
          * @var $rawContentState \Prezly\DraftPhp\Model\RawDraftContentState

tests/SerializerTest.php

@@ -23,6 +23,32 @@ public function it_should_serialize_content_to_equivalent_json(string $json)
         $this->assertJsonStringEqualsJsonString(trim($json), $serialized);
     }
 
+    /**
+     * @test
+     * @dataProvider fixtures
+     *
+     * @param string $json
+     */
+    public function it_should_serialize_to_raw_content_state(string $json)
+    {
+        $rawContentState = $this->serializeRaw($this->convert($json));
+
+        $this->assertJsonStringEqualsJsonString($json, json_encode($rawContentState));
+    }
+
+    /**
+     * @test
+     * @dataProvider fixtures
+     *
+     * @param string $json
+     */
+    public function content_state_instance_should_be_json_serializable(string $json)
+    {
+        $contentState = $this->convert($json);
+
+        $this->assertJsonStringEqualsJsonString($json, json_encode($contentState));
+    }
+
     public function fixtures()
     {
         $handle = opendir(self::FIXTURES_DIR);
@@ -52,4 +78,11 @@ private function serialize(ContentState $contentState, int $options = JSON_PRETT
     {
         return Serializer::serialize($contentState, $options);
     }
+
+    private function serializeRaw(ContentState $contentState)
+    {
+        $serializer = new Serializer();
+
+        return $serializer->serializeRaw($contentState);
+    }
 }