fix mal april fools 2024 affecting score

.gitignore

@@ -6,3 +6,4 @@
 /.php-cs-fixer.cache
 composer.phar
 .phpunit.result.cache
+/.phpdoc

src/Model/Manga/Manga.php

@@ -211,8 +211,8 @@ public static function fromParser(MangaParser $parser): Manga
         $instance->explicitGenres = $parser->getExplicitGenres();
         $instance->demographics = $parser->getDemographics();
         $instance->themes = $parser->getThemes();
-        $instance->score = $parser->getMangaScore();
-        $instance->scoredBy = $parser->getMangaScoredBy();
+        $instance->score = $parser->getScore();
+        $instance->scoredBy = $parser->getScoredBy();
         $instance->rank = $parser->getMangaRank();
         $instance->popularity = $parser->getMangaPopularity();
         $instance->members = $parser->getMangaMembers();

src/Parser/Anime/AnimeParser.php

@@ -556,18 +556,19 @@ public function getRating(): ?string
      */
     public function getScore(): ?float
     {
-        $score = trim(
-            $this->crawler->filterXPath('//div[@class="fl-l score"]')->text()
-        );
+        $score = $this->crawler->filterXPath('//span[@itemprop="ratingValue"]');
+
+        if (!$score->count()) {
+            return null;
+        }
+
+        $score = JString::cleanse($score->text());
 
         if ($score === 'N/A') {
             return null;
         }
 
         return (float) $score;
-
-        // doesn't work for some IDs like `29711`
-        //return Parser::textOrNull($this->crawler->filterXPath('//span[@itemprop="ratingValue"]'));
     }
 
     /**
@@ -576,7 +577,13 @@ public function getScore(): ?float
      */
     public function getScoredBy(): ?int
     {
-        $scoredBy = $this->crawler->filterXPath('//div[@class="fl-l score"]')->attr('data-user');
+        $scoredBy = $this->crawler->filterXPath('//span[@itemprop="ratingCount"]');
+
+        if (!$scoredBy->count()) {
+            return null;
+        }
+
+        $scoredBy = JString::cleanse($scoredBy->text());
 
         $scoredByNum = str_replace(
             [',', ' users', ' user'],

src/Parser/Manga/MangaParser.php

@@ -456,37 +456,49 @@ function (Crawler $crawler) {
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
-    public function getMangaScore(): ?float
+    public function getScore(): ?float
     {
-        $score = $this->crawler
-            ->filter('span[itemprop="ratingValue"]');
+        $score = $this->crawler->filterXPath('//span[@itemprop="ratingValue"]');
 
         if (!$score->count()) {
             return null;
         }
 
-        if (strpos($score->text(), 'N/A')) {
+        $score = JString::cleanse($score->text());
+
+        if ($score === 'N/A') {
             return null;
         }
 
-        return (float)$score->text();
+        return (float) $score;
     }
 
     /**
      * @return int
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
-    public function getMangaScoredBy(): ?int
+    public function getScoredBy(): ?int
     {
-        $scoredBy = $this->crawler
-            ->filter('span[itemprop="ratingCount"]');
+        $scoredBy = $this->crawler->filterXPath('//span[@itemprop="ratingCount"]');
 
         if (!$scoredBy->count()) {
             return null;
         }
 
-        return (int)$scoredBy->text();
+        $scoredBy = JString::cleanse($scoredBy->text());
+
+        $scoredByNum = str_replace(
+            [',', ' users', ' user'],
+            '',
+            $scoredBy
+        );
+
+        if (!is_numeric($scoredByNum)) {
+            return null;
+        }
+
+        return (int) $scoredByNum;
     }
 
     /**