refactor: Complete models attributes (#66)

src/Model/Card.php

@@ -56,128 +56,75 @@ protected function fill(object $data): void
         }
     }
 
-    /**
-     * @var string|null
-     */
-    public $illustrator;
+    public ?string $illustrator = null;
 
-    /**
-     * @var string
-     */
-    public $rarity;
+    public string $rarity = '';
 
-    /**
-     * @var string
-     */
-    public $category;
+    public string $category = '';
 
-    /**
-     * @var Variants
-     */
-    public $variants;
+    public Variants $variants;
 
-    /**
-     * @var SetResume
-     */
-    public $set;
+    public SetResume $set;
 
     /**
-     * @var int[]|null
+     * @var int[]
      */
-    public $dexId;
+    public ?array $dexId = null;
 
-    /**
-     * @var int|null
-     */
-    public $hp;
-    /**
-     * @var string[]|null
-     */
-    public $types;
+    public ?int $hp = null;
 
     /**
-     * @var string|null
+     * @var string[]
      */
-    public $evolveFrom;
+    public ?array $types = null;
+
+    public ?string $evolveFrom = null;
 
     /**
      * Temporarly not implemented due to #28
      */
     // public $weight;
     // public $height;
 
-    /**
-     * @var string|null
-     */
-    public $description;
+    public ?string $description = null;
 
-    /**
-     * @var string|int|null
-     */
-    public $level;
+    public string|int|null $level = null;
 
-    /**
-     * @var string|null
-     */
-    public $stage;
+    public ?string $stage = null;
 
-    /**
-     * @var string|null
-     */
-    public $suffix;
+    public ?string $suffix = null;
 
-    /**
-     * @var Item|null
-     */
-    public $item;
+    public ?Item $item = null;
 
     /**
      * @var Ability[]
      */
-    public $abilities;
+    public array $abilities = [];
 
     /**
      * @var Attack[]
      */
-    public $attacks;
+    public array $attacks = [];
 
     /**
      * @var WeakRes[]
      */
-    public $weaknesses;
+    public array $weaknesses = [];
 
     /**
      * @var WeakRes[]
      */
-    public $resistances;
+    public array $resistances = [];
 
-    /**
-     * @var int|null
-     */
-    public $retreat;
+    public ?int $retreat = null;
 
-    /**
-     * @var string|null
-     */
-    public $effect;
+    public ?string $effect = null;
 
-    /**
-     * @var string|null
-     */
-    public $trainerType;
+    public ?string $trainerType = null;
 
-    /**
-     * @var string|null
-     */
-    public $energyType;
+    public ?string $energyType = null;
 
-    /**
-     * @var string|null
-     */
-    public $regulationMark;
+    public ?string $regulationMark = null;
 
-    /**
-     * @var Legal
-     */
-    public $legal;
+    public Legal $legal;
 }

src/Model/CardResume.php

@@ -4,25 +4,13 @@
 
 class CardResume extends Model
 {
-    /**
-     * @var string
-     */
-    public $id;
+    public string $id = '';
 
-    /**
-     * @var string
-     */
-    public $localId;
+    public string $localId = '';
 
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name = '';
 
-    /**
-     * @var string|null
-     */
-    public $image;
+    public ?string $image = null;
 
     /**
      * @deprecated 2.2.0 use `toCard()` instead

src/Model/Model.php

@@ -2,17 +2,13 @@
 
 namespace TCGdex\Model;
 
+use TCGdex\TCGdex;
+
 abstract class Model
 {
-    /**
-     * @var \TCGdex\TCGdex
-     */
-    protected $sdk;
+    protected TCGdex $sdk;
 
-    /**
-     * @param \TCGdex\TCGdex $sdk
-     */
-    public function __construct(&$sdk)
+    public function __construct(TCGdex $sdk)
     {
         $this->sdk = $sdk;
     }

src/Model/Serie.php

@@ -7,7 +7,7 @@ class Serie extends SerieResume
     /**
      * @var SetResume[]
      */
-    public $sets;
+    public array $sets = [];
 
     protected function fill(object $data): void
     {

src/Model/SerieResume.php

@@ -4,20 +4,11 @@
 
 class SerieResume extends Model
 {
-    /**
-     * @var string
-     */
-    public $id;
+    public string $id = '';
 
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name = '';
 
-    /**
-     * @var string|null
-     */
-    public $logo;
+    public ?string $logo = null;
 
     /**
      * @deprecated 2.2.0 use `toSerie()` instead
@@ -27,9 +18,6 @@ public function fetchFullSerie(): Serie
         return $this->toSerie();
     }
 
-    /**
-     * @return Serie
-     */
     public function toSerie(): Serie
     {
         return $this->sdk->serie->get($this->id);

src/Model/Set.php

@@ -8,31 +8,15 @@
 
 class Set extends SetResume
 {
-    /**
-     * @var SerieResume
-     */
-    public $serie;
+    public SerieResume $serie;
 
-    /**
-     * @var string|null
-     */
-    public $tcgOnline;
+    public ?string $tcgOnline = null;
 
+    public ?Variants $variants = null;
 
-    /**
-     * @var Variants|null
-     */
-    public $variants;
+    public string $releaseDate = '';
 
-    /**
-     * @var string
-     */
-    public $releaseDate;
-
-    /**
-     * @var Legal
-     */
-    public $legal;
+    public Legal $legal;
 
     /**
      * @var CardCount
@@ -42,7 +26,7 @@ class Set extends SetResume
     /**
      * @var CardResume[]
      */
-    public $cards;
+    public array $cards = [];
 
     protected function fill(object $data): void
     {

src/Model/SetResume.php

@@ -6,25 +6,13 @@
 
 class SetResume extends Model
 {
-    /**
-     * @var string
-     */
-    public $id;
+    public string $id = '';
 
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name = '';
 
-    /**
-     * @var string|null
-     */
-    public $logo;
+    public ?string $logo = null;
 
-    /**
-     * @var string|null
-     */
-    public $symbol;
+    public ?string $symbol = null;
 
     /**
      * @var CardCountResume
@@ -42,9 +30,6 @@ protected function fill(object $data): void
         }
     }
 
-    /**
-     * @return Set
-     */
     public function toSet(): Set
     {
         return $this->sdk->set->get($this->id);

src/Model/StringEndpoint.php

@@ -4,6 +4,13 @@
 
 class StringEndpoint extends Model
 {
+    public string $name = '';
+
+    /**
+     * @var CardResume[]
+     */
+    public array $cards = [];
+
     protected function fill(object $data): void
     {
         foreach ($data as $key => $value) {
@@ -16,14 +23,4 @@ protected function fill(object $data): void
             }
         }
     }
-
-    /**
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @var \TCGdex\Model\CardResume[]
-     */
-    public $cards;
 }

src/Model/SubModel/Ability.php

@@ -6,18 +6,9 @@
 
 class Ability extends Model
 {
-    /**
-     * @var string
-     */
-    public $type;
+    public string $type = '';
 
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name = '';
 
-    /**
-     * @var string
-     */
-    public $effect;
+    public string $effect = '';
 }