refactor: Jsonable::toJson() can now be run with JsonStrategy

refs #8

Author: ThorstenSuckow

src/Core/ParameterBag.php

@@ -32,6 +32,7 @@
 use Conjoon\Util\ArrayUtil;
 use BadMethodCallException;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 
 /**
  * A ParameterBag providing object syntax for accessing array arguments and
@@ -172,7 +173,7 @@ public function keys()
      *
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         return json_decode(json_encode($this->data), true);
     }

src/Core/ResourceQuery.php

@@ -31,6 +31,7 @@
 
 use BadMethodCallException;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 
 /**
  * A ResourceQuery provides an interface for a validated and certified collection
@@ -107,7 +108,7 @@ public function has($key): bool
      *
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         return $this->parameters->toJson();
     }

src/Http/Json/Problem/AbstractProblem.php

@@ -31,6 +31,7 @@
 
 use BadMethodCallException;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 
 /**
  * Abstract base class for representatives according to rfc7807.
@@ -146,7 +147,7 @@ public function __call(string $method, $arguments)
      *
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         $data = [
             "status" => $this->status,

src/Mail/Client/Attachment/AbstractAttachment.php

@@ -32,6 +32,7 @@
 use BadMethodCallException;
 use Conjoon\Mail\Client\Data\CompoundKey\AttachmentKey;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 use InvalidArgumentException;
 
 /**
@@ -155,7 +156,7 @@ public function setSize(int $size)
     /**
      * @inheritdoc
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         return array_merge(
             $this->attachmentKey ? $this->attachmentKey->toJson() : [],

src/Mail/Client/Attachment/FileAttachment.php

@@ -31,6 +31,7 @@
 
 use Conjoon\Mail\Client\Data\CompoundKey\AttachmentKey;
 use Conjoon\Util\ArrayUtil;
+use Conjoon\Util\JsonStrategy;
 use InvalidArgumentException;
 
 /**
@@ -124,7 +125,7 @@ public function setAttachmentKey(AttachmentKey $attachmentKey): FileAttachment
     /**
      * @inheritdoc
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         return array_merge(parent::toJson(), [
             "content" => $this->getContent(),

src/Mail/Client/Attachment/FileAttachmentItem.php

@@ -30,6 +30,7 @@
 namespace Conjoon\Mail\Client\Attachment;
 
 use Conjoon\Mail\Client\Data\CompoundKey\AttachmentKey;
+use Conjoon\Util\JsonStrategy;
 use InvalidArgumentException;
 
 /**
@@ -91,7 +92,7 @@ public function __construct(AttachmentKey $attachmentKey, array $data)
     /**
      * @inheritdoc
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
 
         return array_merge(parent::toJson(), [

src/Mail/Client/Attachment/FileAttachmentItemList.php

@@ -31,6 +31,7 @@
 
 use Conjoon\Util\AbstractList;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 
 /**
  * Class FileAttachmentItemList organizes a list of FileAttachmentItems.
@@ -60,7 +61,7 @@ public function getEntityType(): string
     /**
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
 
         $data = [];

src/Mail/Client/Attachment/FileAttachmentList.php

@@ -31,6 +31,7 @@
 
 use Conjoon\Util\AbstractList;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 
 /**
  * Class FileAttachmentList organizes a list of FileAttachments.
@@ -51,7 +52,7 @@ public function getEntityType(): string
     /**
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
 
         $data = [];

src/Mail/Client/Data/CompoundKey/CompoundKey.php

@@ -31,6 +31,7 @@
 
 use Conjoon\Mail\Client\Data\MailAccount;
 use Conjoon\Util\Jsonable;
+use Conjoon\Util\JsonStrategy;
 use Conjoon\Util\Stringable;
 
 /**
@@ -96,7 +97,7 @@ public function getId(): string
      *
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         return [
             'id' => $this->getId(),

src/Mail/Client/Data/CompoundKey/MessageItemChildCompoundKey.php

@@ -29,6 +29,7 @@
 
 namespace Conjoon\Mail\Client\Data\CompoundKey;
 
+use Conjoon\Util\JsonStrategy;
 use InvalidArgumentException;
 
 /**
@@ -124,7 +125,7 @@ public function equals(MessageItemChildCompoundKey $key): bool
      *
      * @return array
      */
-    public function toJson(): array
+    public function toJson(JsonStrategy $strategy = null): array
     {
         $json = parent::toJson();
         $json["parentMessageItemId"] = $this->getParentMessageItemId();