From 5c382db49c54809696fc5a2492dd6d76ad31d789 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 2 Mar 2017 11:12:19 -0500 Subject: [PATCH] Move AnimeWatchingStatus and MangaReadingStatus enums to the same namespace --- .../AnimeWatchingStatus/Kitsu.php} | 6 +-- .../AnimeWatchingStatus/MAL.php} | 6 +-- .../MangaReadingStatus/Kitsu.php} | 9 ++--- .../MangaReadingStatus/MAL.php} | 6 +-- .../MAL/Transformer/AnimeListTransformer.php | 37 +++++++------------ src/API/Mapping/AnimeWatchingStatus.php | 10 +++-- src/API/Mapping/MangaReadingStatus.php | 9 +++-- 7 files changed, 38 insertions(+), 45 deletions(-) rename src/API/{Kitsu/Enum/AnimeWatchingStatus.php => Enum/AnimeWatchingStatus/Kitsu.php} (85%) rename src/API/{MAL/Enum/AnimeWatchingStatus.php => Enum/AnimeWatchingStatus/MAL.php} (84%) rename src/API/{Kitsu/Enum/MangaReadingStatus.php => Enum/MangaReadingStatus/Kitsu.php} (82%) rename src/API/{MAL/Enum/MangaReadingStatus.php => Enum/MangaReadingStatus/MAL.php} (85%) diff --git a/src/API/Kitsu/Enum/AnimeWatchingStatus.php b/src/API/Enum/AnimeWatchingStatus/Kitsu.php similarity index 85% rename from src/API/Kitsu/Enum/AnimeWatchingStatus.php rename to src/API/Enum/AnimeWatchingStatus/Kitsu.php index 66aa0b05..0e01fea3 100644 --- a/src/API/Kitsu/Enum/AnimeWatchingStatus.php +++ b/src/API/Enum/AnimeWatchingStatus/Kitsu.php @@ -14,14 +14,14 @@ * @link https://github.com/timw4mail/HummingBirdAnimeClient */ -namespace Aviat\AnimeClient\API\Kitsu\Enum; +namespace Aviat\AnimeClient\API\Enum\AnimeWatchingStatus; -use Aviat\Ion\Enum as BaseEnum; +use Aviat\Ion\Enum; /** * Possible values for watching status for the current anime */ -class AnimeWatchingStatus extends BaseEnum { +class Kitsu extends Enum { const WATCHING = 'current'; const PLAN_TO_WATCH = 'planned'; const COMPLETED = 'completed'; diff --git a/src/API/MAL/Enum/AnimeWatchingStatus.php b/src/API/Enum/AnimeWatchingStatus/MAL.php similarity index 84% rename from src/API/MAL/Enum/AnimeWatchingStatus.php rename to src/API/Enum/AnimeWatchingStatus/MAL.php index 7af37b47..48a2bf2f 100644 --- a/src/API/MAL/Enum/AnimeWatchingStatus.php +++ b/src/API/Enum/AnimeWatchingStatus/MAL.php @@ -14,14 +14,14 @@ * @link https://github.com/timw4mail/HummingBirdAnimeClient */ -namespace Aviat\AnimeClient\API\MAL\Enum; +namespace Aviat\AnimeClient\API\Enum\AnimeWatchingStatus; -use Aviat\Ion\Enum as BaseEnum; +use Aviat\Ion\Enum; /** * Possible values for watching status for the current anime */ -class AnimeWatchingStatus extends BaseEnum { +class MAL extends Enum { const WATCHING = 1; const COMPLETED = 2; const ON_HOLD = 3; diff --git a/src/API/Kitsu/Enum/MangaReadingStatus.php b/src/API/Enum/MangaReadingStatus/Kitsu.php similarity index 82% rename from src/API/Kitsu/Enum/MangaReadingStatus.php rename to src/API/Enum/MangaReadingStatus/Kitsu.php index ea5f1759..35b53b0a 100644 --- a/src/API/Kitsu/Enum/MangaReadingStatus.php +++ b/src/API/Enum/MangaReadingStatus/Kitsu.php @@ -14,18 +14,17 @@ * @link https://github.com/timw4mail/HummingBirdAnimeClient */ -namespace Aviat\AnimeClient\API\Kitsu\Enum; +namespace Aviat\AnimeClient\API\Enum\MangaReadingStatus; -use Aviat\Ion\Enum as BaseEnum; +use Aviat\Ion\Enum; /** * Possible values for current reading status of manga */ -class MangaReadingStatus extends BaseEnum { +class Kitsu extends Enum { const READING = 'current'; const PLAN_TO_READ = 'planned'; const DROPPED = 'dropped'; const ON_HOLD = 'on_hold'; const COMPLETED = 'completed'; -} -// End of MangaReadingStatus.php \ No newline at end of file +} \ No newline at end of file diff --git a/src/API/MAL/Enum/MangaReadingStatus.php b/src/API/Enum/MangaReadingStatus/MAL.php similarity index 85% rename from src/API/MAL/Enum/MangaReadingStatus.php rename to src/API/Enum/MangaReadingStatus/MAL.php index 9f7433cc..07951b51 100644 --- a/src/API/MAL/Enum/MangaReadingStatus.php +++ b/src/API/Enum/MangaReadingStatus/MAL.php @@ -14,14 +14,14 @@ * @link https://github.com/timw4mail/HummingBirdAnimeClient */ -namespace Aviat\AnimeClient\API\MAL\Enum; +namespace Aviat\AnimeClient\API\Enum\MangaReadingStatus; -use Aviat\Ion\Enum as BaseEnum; +use Aviat\Ion\Enum; /** * Possible values for watching status for the current anime */ -class MangaReadingStatus extends BaseEnum { +class MAL extends Enum { const READING = 'reading'; const COMPLETED = 'completed'; const ON_HOLD = 'onhold'; diff --git a/src/API/MAL/Transformer/AnimeListTransformer.php b/src/API/MAL/Transformer/AnimeListTransformer.php index 19714c18..f70c1eb1 100644 --- a/src/API/MAL/Transformer/AnimeListTransformer.php +++ b/src/API/MAL/Transformer/AnimeListTransformer.php @@ -16,22 +16,13 @@ namespace Aviat\AnimeClient\API\MAL\Transformer; -use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus; +use Aviat\AnimeClient\API\Mapping\AnimeWatchingStatus; use Aviat\Ion\Transformer\AbstractTransformer; /** * Transformer for updating MAL List */ class AnimeListTransformer extends AbstractTransformer { - - const STATUS_MAP = [ - AnimeWatchingStatus::WATCHING => '1', - AnimeWatchingStatus::COMPLETED => '2', - AnimeWatchingStatus::ON_HOLD => '3', - AnimeWatchingStatus::DROPPED => '4', - AnimeWatchingStatus::PLAN_TO_WATCH => '6' - ]; - /** * Transform MAL episode data to Kitsu episode data * @@ -45,7 +36,7 @@ class AnimeListTransformer extends AbstractTransformer { return [ 'id' => $item['mal_id'], 'data' => [ - 'status' => self::STATUS_MAP[$item['watching_status']], + 'status' => AnimeWatchingStatus::KITSU_TO_MAL[$item['watching_status']], 'rating' => $item['user_rating'], 'rewatch_value' => (int) $rewatching, 'times_rewatched' => $item['rewatched'], @@ -54,12 +45,12 @@ class AnimeListTransformer extends AbstractTransformer { ] ]; } - + /** * Transform Kitsu episode data to MAL episode data * - * @param array $item - * @return array + * @param array $item + * @return array */ public function untransform(array $item): array { @@ -69,33 +60,33 @@ class AnimeListTransformer extends AbstractTransformer { 'episode' => $item['data']['progress'] ] ]; - + $data =& $item['data']; - + foreach($item['data'] as $key => $value) { - switch($key) + switch($key) { case 'notes': $map['data']['comments'] = $value; break; - + case 'rating': $map['data']['score'] = $value * 2; break; - + case 'reconsuming': $map['data']['enable_rewatching'] = (bool) $value; break; - + case 'reconsumeCount': $map['data']['times_rewatched'] = $value; break; - + case 'status': - $map['data']['status'] = self::STATUS_MAP[$value]; + $map['data']['status'] = AnimeWatchingStatus::KITSU_TO_MAL[$value]; break; - + default: break; } diff --git a/src/API/Mapping/AnimeWatchingStatus.php b/src/API/Mapping/AnimeWatchingStatus.php index 8134ae71..cad1c52d 100644 --- a/src/API/Mapping/AnimeWatchingStatus.php +++ b/src/API/Mapping/AnimeWatchingStatus.php @@ -15,10 +15,12 @@ */ namespace Aviat\AnimeClient\API\Mapping; -use Aviat\AnimeClient\API\Enum\AnimeWatchingStatus\{Route, Title}; -use Aviat\AnimeClient\API\{ - Kitsu\Enum\AnimeWatchingStatus as Kitsu, - MAL\Enum\AnimeWatchingStatus as MAL + +use Aviat\AnimeClient\API\Enum\AnimeWatchingStatus\{ + Kitsu, + MAL, + Route, + Title }; use Aviat\Ion\Enum; diff --git a/src/API/Mapping/MangaReadingStatus.php b/src/API/Mapping/MangaReadingStatus.php index 9269f49a..99f52fb5 100644 --- a/src/API/Mapping/MangaReadingStatus.php +++ b/src/API/Mapping/MangaReadingStatus.php @@ -16,11 +16,12 @@ namespace Aviat\AnimeClient\API\Mapping; -use Aviat\AnimeClient\API\{ - Kitsu\Enum\MangaReadingStatus as Kitsu, - MAL\Enum\MangaReadingStatus as MAL +use Aviat\AnimeClient\API\Enum\MangaReadingStatus\{ + Kitsu, + MAL, + Title, + Route }; -use Aviat\AnimeClient\API\Enum\MangaReadingStatus\{Title, Route}; use Aviat\Ion\Enum; class MangaReadingStatus extends Enum {