added minor code quality fixes

- explicit throw if no URL can be found for reviews - usage of array_filter for the "each" method call on dom search
jikan-me · Jun 5, 2022 · d916326 · d916326
1 parent b54c96d
commit d916326
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 27 deletions.
diff --git a/src/Model/Reviews/Reviewer.php b/src/Model/Reviews/Reviewer.php
@@ -24,7 +24,7 @@ public static function fromParser(ReviewerParser $parser): self
     {
         $instance = new self();
 
-        $instance->url= $parser->getUrl();
+        $instance->url = $parser->getUrl();
         $instance->images = UserImageResource::factory($parser->getImageUrl());
         $instance->username = $parser->getUsername();
 

diff --git a/src/Parser/Reviews/MangaReviewParser.php b/src/Parser/Reviews/MangaReviewParser.php
@@ -2,12 +2,11 @@
 
 namespace Jikan\Parser\Reviews;
 
+use Jikan\Exception\ParserException;
 use Jikan\Helper\JString;
 use Jikan\Helper\Parser;
-use Jikan\Model\Common\AnimeMeta;
 use Jikan\Model\Common\MangaMeta;
 use Jikan\Model\Manga\MangaReview;
-use Jikan\Model\Manga\MangaReviewer;
 use Jikan\Model\Manga\MangaReviewScores;
 use Jikan\Model\Reviews\Reviewer;
 use Jikan\Parser\Manga\MangaReviewScoresParser;
@@ -22,9 +21,9 @@
 class MangaReviewParser implements ParserInterface
 {
     /**
-     * @var Crawler
+     * @var \Symfony\Component\DomCrawler\Crawler
      */
-    private $crawler;
+    private Crawler $crawler;
 
     /**
      * MangaReviewParser constructor.
@@ -37,7 +36,7 @@ public function __construct(Crawler $crawler)
     }
 
     /**
-     * @return MangaReview
+     * @return \Jikan\Model\Manga\MangaReview
      * @throws \Exception
      * @throws \RuntimeException
      */
@@ -46,6 +45,9 @@ public function getModel(): MangaReview
         return MangaReview::fromParser($this);
     }
 
+    /**
+     * @throws \Jikan\Exception\ParserException
+     */
     public function getManga() : MangaMeta
     {
         return new MangaMeta(
@@ -192,6 +194,7 @@ public function getReviewedTitle(): string
     /**
      * @return string
      * @throws \InvalidArgumentException
+     * @throws \Jikan\Exception\ParserException
      */
     public function getReviewedImageUrl(): string
     {
@@ -211,7 +214,7 @@ public function getReviewedImageUrl(): string
             return Parser::parseImageQuality($node->attr('data-src'));
         }
 
-        return "";
+        throw new ParserException("Couldn't find the URL of reviewed image.");
     }
 
     /**

diff --git a/src/Parser/Reviews/RecentReviewsParser.php b/src/Parser/Reviews/RecentReviewsParser.php
@@ -42,30 +42,32 @@ public function getModel(): RecentReviews
     /**
      * @return array
      * @throws \RuntimeException
-     * @throws \InvalidArgumentException
+     * @throws \InvalidArgumentException|\Exception
      */
     public function getRecentReviews(): array
     {
-        return $this->crawler
-            ->filterXPath('//*[@id="content"]/div[@class="borderDark"]')
-            ->each(
-                function (Crawler $crawler) {
-                    // If requested by $type `Constants::TOP_REVIEWS_BEST_VOTED`; both types can be returned
-                    // So we check types here to allow the ability to parse and return both
+        return array_filter(
+            $this->crawler
+                ->filterXPath('//*[@id="content"]/div[@class="borderDark"]')
+                ->each(
+                    function (Crawler $crawler) {
+                        // If requested by $type `Constants::TOP_REVIEWS_BEST_VOTED`; both types can be returned
+                        // So we check types here to allow the ability to parse and return both
 
-                    // Anime Review
-                    if ($crawler->filterXPath('//div[1]/div[1]/div[2]/small')->text() === '(Anime)') {
-                        return RecentAnimeReview::fromParser(new AnimeReviewParser($crawler));
-                    }
+                        // Anime Review
+                        if ($crawler->filterXPath('//div[1]/div[1]/div[2]/small')->text() === '(Anime)') {
+                            return RecentAnimeReview::fromParser(new AnimeReviewParser($crawler));
+                        }
 
-                    // Manga Review
-                    if ($crawler->filterXPath('//div[1]/div[1]/div[2]/small')->text() === '(Manga)') {
-                        return RecentMangaReview::fromParser(new MangaReviewParser($crawler));
-                    }
+                        // Manga Review
+                        if ($crawler->filterXPath('//div[1]/div[1]/div[2]/small')->text() === '(Manga)') {
+                            return RecentMangaReview::fromParser(new MangaReviewParser($crawler));
+                        }
 
-                    return null;
-                }
-            );
+                        return null;
+                    }
+                )
+        );
     }
 
     /**

diff --git a/src/Parser/Reviews/ReviewerParser.php b/src/Parser/Reviews/ReviewerParser.php
@@ -2,7 +2,7 @@
 
 namespace Jikan\Parser\Reviews;
 
-use Jikan\Helper\JString;
+use Jikan\Exception\ParserException;
 use Jikan\Helper\Parser;
 use Jikan\Model\Anime\AnimeReviewScores;
 use Jikan\Model\Manga\MangaReviewScores;
@@ -41,6 +41,7 @@ public function getModel()
     /**
      * @return string
      * @throws \InvalidArgumentException
+     * @throws \Jikan\Exception\ParserException
      */
     public function getUrl(): string
     {
@@ -56,7 +57,7 @@ public function getUrl(): string
             return $node->attr('href');
         }
 
-        return "";
+        throw new ParserException("Couldn't find any URL on review pages.");
     }
 
     /**