From 165783982616b4404a4c05a72b14c4cf4759af68 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:09:56 +0200 Subject: [PATCH 01/15] Variant model --- src/Model/SubModel/Variants.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/Model/SubModel/Variants.php b/src/Model/SubModel/Variants.php index 2cce1a2..01fb70c 100644 --- a/src/Model/SubModel/Variants.php +++ b/src/Model/SubModel/Variants.php @@ -6,23 +6,13 @@ class Variants extends Model { - /** - * @var string|null - */ - public $normal; + public ?bool $normal = null; - /** - * @var string|null - */ - public $reverse; + public ?bool $reverse = null; - /** - * @var string|null - */ - public $holo; + public ?bool $holo = null; - /** - * @var string|null - */ - public $firstEdition; + public ?bool $firstEdition = null; + + public ?bool $wPromo = null; } From 776e129297c846768487d6f41e545c59385db620 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:10:40 +0200 Subject: [PATCH 02/15] WeakRes model --- src/Model/SubModel/WeakRes.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Model/SubModel/WeakRes.php b/src/Model/SubModel/WeakRes.php index 93755e9..1cb17a6 100644 --- a/src/Model/SubModel/WeakRes.php +++ b/src/Model/SubModel/WeakRes.php @@ -6,13 +6,7 @@ class WeakRes extends Model { - /** - * @var string - */ - public $type; + public string $type = ''; - /** - * @var string|null - */ - public $value; + public ?string $value = null; } From a453352a6474ec27d1801c2efc8d9c33fdfb24c5 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:11:59 +0200 Subject: [PATCH 03/15] Legal Model --- src/Model/SubModel/Legal.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Model/SubModel/Legal.php b/src/Model/SubModel/Legal.php index ee74a1d..c221af1 100644 --- a/src/Model/SubModel/Legal.php +++ b/src/Model/SubModel/Legal.php @@ -6,13 +6,7 @@ class Legal extends Model { - /** - * @var bool - */ - public $standard; + public bool $standard; - /** - * @var bool - */ - public $expanded; + public bool $expanded; } From 2296200f8c4ebbb81538e80002ca98de92791b62 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:12:38 +0200 Subject: [PATCH 04/15] Item Model --- src/Model/SubModel/Item.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Model/SubModel/Item.php b/src/Model/SubModel/Item.php index 484394c..763ca67 100644 --- a/src/Model/SubModel/Item.php +++ b/src/Model/SubModel/Item.php @@ -6,13 +6,7 @@ class Item extends Model { - /** - * @var string - */ - public $name; + public string $name = ''; - /** - * @var string - */ - public $effect; + public string $effect = ''; } From 15ce1e6955994c7448949374a21aa60e61c6f10c Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:13:14 +0200 Subject: [PATCH 05/15] CardCountResume Model --- src/Model/SubModel/CardCountResume.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Model/SubModel/CardCountResume.php b/src/Model/SubModel/CardCountResume.php index 7a0d95e..98217ea 100644 --- a/src/Model/SubModel/CardCountResume.php +++ b/src/Model/SubModel/CardCountResume.php @@ -6,13 +6,7 @@ class CardCountResume extends Model { - /** - * @var int - */ - public $total; + public int $total = 0; - /** - * @var int - */ - public $official; + public int $official = 0; } From 7759bbd93e23801b261680a71dc4572160c11760 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:16:58 +0200 Subject: [PATCH 06/15] CardCount Model --- src/Model/SubModel/CardCount.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Model/SubModel/CardCount.php b/src/Model/SubModel/CardCount.php index f491df2..0770267 100644 --- a/src/Model/SubModel/CardCount.php +++ b/src/Model/SubModel/CardCount.php @@ -4,23 +4,11 @@ class CardCount extends CardCountResume { - /** - * @var int - */ - public $normal; + public int $normal = 0; - /** - * @var int - */ - public $reverse; + public int $reverse = 0; - /** - * @var int - */ - public $holo; + public int $holo = 0; - /** - * @var int|null - */ - public $firstEd; + public ?int $firstEd = null; } From 6875827a9e9d96d6f59ba88d3a54e738c89bcea6 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:18:54 +0200 Subject: [PATCH 07/15] Attack Model --- src/Model/SubModel/Attack.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Model/SubModel/Attack.php b/src/Model/SubModel/Attack.php index d7f4a01..6075383 100644 --- a/src/Model/SubModel/Attack.php +++ b/src/Model/SubModel/Attack.php @@ -7,22 +7,13 @@ class Attack extends Model { /** - * @var string[]|null + * @var string[] */ - public $cost; + public ?array $cost = null; - /** - * @var string - */ - public $name; + public string $name = ''; - /** - * @var string|null - */ - public $effect; + public ?string $effect = null; - /** - * @var string|int|null - */ - public $damage; + public string|int|null $damage = null; } From a5737ddb7a8ba4e1f1a235c4e6a3114d4f8e59bf Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:19:45 +0200 Subject: [PATCH 08/15] Ability Model --- src/Model/SubModel/Ability.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Model/SubModel/Ability.php b/src/Model/SubModel/Ability.php index 34d08b6..7b608ba 100644 --- a/src/Model/SubModel/Ability.php +++ b/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 = ''; } From 4f7833ef6d440c130caf4926b623cf8b1170a007 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:28:25 +0200 Subject: [PATCH 09/15] Card Model --- src/Model/Card.php | 107 ++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 80 deletions(-) diff --git a/src/Model/Card.php b/src/Model/Card.php index 5fc8d8f..c1a60e0 100644 --- a/src/Model/Card.php +++ b/src/Model/Card.php @@ -56,49 +56,29 @@ 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 @@ -106,78 +86,45 @@ protected function fill(object $data): void // 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; } From 2e520809ef62a5e59ed4502db9644c07ae545731 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:29:21 +0200 Subject: [PATCH 10/15] CardResume Model --- src/Model/CardResume.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Model/CardResume.php b/src/Model/CardResume.php index 731d823..c2c685e 100644 --- a/src/Model/CardResume.php +++ b/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 From 0de66e69c3f92937fd5071a9977754b80e413318 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:31:07 +0200 Subject: [PATCH 11/15] Model --- src/Model/Model.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Model/Model.php b/src/Model/Model.php index bfed9a3..08d61c6 100644 --- a/src/Model/Model.php +++ b/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; } From 1b5bfa18a321c06cf39d7cd9930adb9c6fd14921 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:31:26 +0200 Subject: [PATCH 12/15] Serie Model --- src/Model/Serie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Serie.php b/src/Model/Serie.php index a07571c..55820d9 100644 --- a/src/Model/Serie.php +++ b/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 { From 7db24bd98e7a4c5540e2c213b3e7a60741564c49 Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:32:25 +0200 Subject: [PATCH 13/15] SerieResume Model --- src/Model/SerieResume.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/Model/SerieResume.php b/src/Model/SerieResume.php index 9bc600c..03a7892 100644 --- a/src/Model/SerieResume.php +++ b/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); From 83384c54f28eb8978ad4194b413166699237186e Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:50:12 +0200 Subject: [PATCH 14/15] Set + SetResume Model --- src/Model/Set.php | 28 ++++++---------------------- src/Model/SetResume.php | 23 ++++------------------- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/src/Model/Set.php b/src/Model/Set.php index d2733d0..83f98ba 100644 --- a/src/Model/Set.php +++ b/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 { diff --git a/src/Model/SetResume.php b/src/Model/SetResume.php index cc271d4..4b8bed4 100644 --- a/src/Model/SetResume.php +++ b/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); From 3f11114917eeb4c07831632dc4b36ecaeb98b61d Mon Sep 17 00:00:00 2001 From: Cyril Lussiana Date: Wed, 26 Jun 2024 17:51:43 +0200 Subject: [PATCH 15/15] StringEndpoint Model --- src/Model/StringEndpoint.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Model/StringEndpoint.php b/src/Model/StringEndpoint.php index 0b1e33c..590f6cd 100644 --- a/src/Model/StringEndpoint.php +++ b/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; }