From 332ff723600ee33efa62b8e491109d0144c2747e Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Mon, 11 May 2020 09:17:11 -0400 Subject: [PATCH] Bug fixes --- src/AnimeClient/API/Kitsu.php | 11 +++++++---- .../API/Kitsu/Transformer/MangaTransformer.php | 4 ++-- src/AnimeClient/API/ParallelAPIRequest.php | 4 +--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/AnimeClient/API/Kitsu.php b/src/AnimeClient/API/Kitsu.php index 409c905a..441525cd 100644 --- a/src/AnimeClient/API/Kitsu.php +++ b/src/AnimeClient/API/Kitsu.php @@ -225,13 +225,16 @@ final class Kitsu { // The 'canonical' title is always returned $valid = [$data['canonicalTitle']]; - if (array_key_exists('titles', $data)) + foreach (['titles', 'abbreviatedTitles'] as $key) { - foreach($data['titles'] as $alternateTitle) + if (array_key_exists($key, $data) && is_array($data[$key])) { - if (self::titleIsUnique($alternateTitle, $valid)) + foreach($data[$key] as $alternateTitle) { - $valid[] = $alternateTitle; + if (self::titleIsUnique($alternateTitle, $valid)) + { + $valid[] = $alternateTitle; + } } } } diff --git a/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php index b697d4d0..2d428537 100644 --- a/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php +++ b/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php @@ -98,12 +98,12 @@ final class MangaTransformer extends AbstractTransformer { if ( ! empty($characters['main'])) { - uasort($characters['main'], fn ($a, $b) => $a['name'] <=> $b['anime']); + uasort($characters['main'], fn ($a, $b) => $a['name'] <=> $b['name']); } if ( ! empty($characters['supporting'])) { - uasort($characters['supporting'], fn ($a, $b) => $a['name'] <=> $b['anime']); + uasort($characters['supporting'], fn ($a, $b) => $a['name'] <=> $b['name']); } ksort($characters); diff --git a/src/AnimeClient/API/ParallelAPIRequest.php b/src/AnimeClient/API/ParallelAPIRequest.php index 83389c92..d781471f 100644 --- a/src/AnimeClient/API/ParallelAPIRequest.php +++ b/src/AnimeClient/API/ParallelAPIRequest.php @@ -103,9 +103,7 @@ final class ParallelAPIRequest { foreach ($this->requests as $key => $url) { - $promises[$key] = call(static function () use ($client, $url) { - return yield $client->request($url); - }); + $promises[$key] = call(fn () => yield $client->request($url)); } return wait(all($promises));