From 9dde2dfa727f061a6834df34f5d440b71a3d872e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 7 Jul 2016 18:48:52 +0200
Subject: [PATCH] Fix json serializable

---
 Datatypes/Address.php        | 6 ++----
 Datatypes/Location.php       | 8 +++-----
 Message/ResponseAbstract.php | 4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Datatypes/Address.php b/Datatypes/Address.php
index 463adeaeb..f00e57543 100644
--- a/Datatypes/Address.php
+++ b/Datatypes/Address.php
@@ -15,8 +15,6 @@
  */
 namespace phpOMS\Datatypes;
 
-use phpOMS\Contract\JsonableInterface;
-
 /**
  * Address class.
  *
@@ -28,7 +26,7 @@ use phpOMS\Contract\JsonableInterface;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-class Address implements JsonableInterface
+class Address implements \JsonSerializable
 {
 
     /**
@@ -161,7 +159,7 @@ class Address implements JsonableInterface
     /**
      * {@inheritdoc}
      */
-    public function toJson(int $option = 0) : string
+    public function jsonSerialize(int $option = 0) : string
     {
         return json_encode($this->toArray());
     }
diff --git a/Datatypes/Location.php b/Datatypes/Location.php
index b6a3f52e6..44128bcd5 100644
--- a/Datatypes/Location.php
+++ b/Datatypes/Location.php
@@ -15,8 +15,6 @@
  */
 namespace phpOMS\Datatypes;
 
-use phpOMS\Contract\JsonableInterface;
-
 /**
  * Location class.
  *
@@ -28,7 +26,7 @@ use phpOMS\Contract\JsonableInterface;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-class Location implements JsonableInterface, \Serializable
+class Location implements \JsonSerializable, \Serializable
 {
 
     /**
@@ -251,7 +249,7 @@ class Location implements JsonableInterface, \Serializable
     /**
      * {@inheritdoc}
      */
-    public function toJson(int $option = 0) : string
+    public function jsonSerialize() : string
     {
         return json_encode($this->toArray());
     }
@@ -264,7 +262,7 @@ class Location implements JsonableInterface, \Serializable
      */
     public function serialize()
     {
-        return $this->toJson();
+        return $this->jsonSerialize();
     }
 
     /**
diff --git a/Message/ResponseAbstract.php b/Message/ResponseAbstract.php
index d9888eb20..a833680f1 100644
--- a/Message/ResponseAbstract.php
+++ b/Message/ResponseAbstract.php
@@ -29,7 +29,7 @@ use phpOMS\Utils\ArrayUtils;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-abstract class ResponseAbstract implements MessageInterface
+abstract class ResponseAbstract implements MessageInterface, \JsonSerializable
 {
 
     /**
@@ -150,7 +150,7 @@ abstract class ResponseAbstract implements MessageInterface
     /**
      * {@inheritdoc}
      */
-    public function toJson(int $options = 0) : string
+    public function jsonSerialize(int $options = 0) : string
     {
         return json_encode($this->toArray());
     }