Merge pull request #7 from NateShoffner/history-fix

Fix: History Deserialization
janvernieuwe · Jan 24, 2022 · d087e31 · d087e31
2 parents e44b922 + 33d2764
commit d087e31
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 15 deletions.
diff --git a/metadata/JikanPHP.Model.Common.HistoryMeta.yml b/metadata/JikanPHP.Model.Common.HistoryMeta.yml
@@ -0,0 +1,10 @@
+JikanPHP\Model\Common\HistoryMeta:
+    properties:
+        malId:
+            type: int
+        type:
+            type: string
+        name:
+            type: string    
+        url:
+            type: string
diff --git a/metadata/JikanPHP.Model.User.History.yml b/metadata/JikanPHP.Model.User.History.yml
@@ -1,7 +1,7 @@
 JikanPHP\Model\User\History:
     properties:
-        malUrl:
-            type: JikanPHP\Model\Common\MalUrl
+        meta:
+            type: JikanPHP\Model\Common\HistoryMeta
         increment:
             type: int
         date:

diff --git a/model/Common/HistoryMeta.php b/model/Common/HistoryMeta.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace JikanPHP\Model\Common;
+
+/**
+ * Class HistoryMeta
+ *
+ * @package JikanPHP\Model
+ */
+class HistoryMeta
+{
+
+    /**
+     * @var string
+     */
+    private $url;
+
+    /**
+     * @var int
+     */
+    private $malId;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @return string
+     */
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMalId(): int
+    {
+        return $this->malId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+}
diff --git a/model/User/History.php b/model/User/History.php
@@ -2,7 +2,7 @@
 
 namespace JikanPHP\Model\User;
 
-use JikanPHP\Model\Common\MalUrl;
+use JikanPHP\Model\Common\HistoryMeta;
 
 /**
  * Class History
@@ -11,11 +11,10 @@
  */
 class History
 {
-
     /**
-     * @var MalUrl
+     * @var HistoryMeta
      */
-    private $malUrl;
+    private HistoryMeta $meta;
 
     /**
      * @var int
@@ -27,14 +26,6 @@ class History
      */
     private $date;
 
-    /**
-     * @return MalUrl
-     */
-    public function getMalUrl(): MalUrl
-    {
-        return $this->malUrl;
-    }
-
     /**
      * @return int
      */
@@ -50,4 +41,12 @@ public function getDate(): \DateTimeImmutable
     {
         return $this->date;
     }
+
+    /**
+     * @return HistoryMeta
+     */
+    public function getMeta(): HistoryMeta
+    {
+        return $this->meta;
+    }
 }
diff --git a/request/User/UserHistoryRequest.php b/request/User/UserHistoryRequest.php
@@ -36,7 +36,7 @@ public function __construct(string $username, $type = '') // "" means empty stri
         $this->username = $username;
 
         if (null !== $type) {
-            if (!\in_array($type, ['anime', 'manga'])) {
+            if (!empty($type) && !\in_array($type, ['anime', 'manga'])) {
                 throw new \InvalidArgumentException(sprintf('Type %s is not valid', $type));
             }