Update Goutte to latest version removing the guzzlePHP dependency

jikan-me · May 31, 2021 · 3a23e88 · 3a23e88
1 parent 306d423
commit 3a23e88
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -25,8 +25,8 @@
         }
     },
     "require": {
-        "fabpot/goutte": "^3.2",
-        "php": "^7.1"
+        "php": "^7.1",
+        "fabpot/goutte": "^4.0"
     },
     "require-dev": {
         "brianium/paratest": "~4.0",

diff --git a/src/Jikan.php b/src/Jikan.php
@@ -11,12 +11,12 @@
 
 namespace Jikan;
 
-use GuzzleHttp\Client as GuzzleClient;
 use Jikan\Exception\ParserException;
 use Jikan\Helper\Constants;
 use Jikan\Model;
 use Jikan\MyAnimeList\MalClient;
 use Jikan\Request;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Class Jikan
@@ -33,11 +33,11 @@ class Jikan
     /**
      * Jikan constructor.
      *
-     * @param GuzzleClient|null $guzzle
+     * @param HttpClientInterface|null $httpClient
      */
-    public function __construct(GuzzleClient $guzzle = null)
+    public function __construct(HttpClientInterface $httpClient = null)
     {
-        $this->myanimelist = new MalClient($guzzle);
+        $this->myanimelist = new MalClient($httpClient);
     }
 
     /**

diff --git a/src/MyAnimeList/MalClient.php b/src/MyAnimeList/MalClient.php
@@ -11,13 +11,13 @@
 
 namespace Jikan\MyAnimeList;
 
-use GuzzleHttp\Client as GuzzleClient;
 use Jikan\Exception\BadResponseException;
 use Jikan\Exception\ParserException;
 use Jikan\Goutte\GoutteWrapper;
 use Jikan\Model;
 use Jikan\Parser;
 use Jikan\Request;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * Class MalClient
@@ -32,16 +32,13 @@ class MalClient
     /**
      * MalClient constructor.
      *
-     * @param GuzzleClient|null $guzzle
+     * @param HttpClientInterfac|null $httpClient
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(GuzzleClient $guzzle = null)
+    public function __construct(HttpClientInterface $httpClient = null)
     {
-        $this->ghoutte = new GoutteWrapper();
-        if ($guzzle !== null) {
-            $this->ghoutte->setClient($guzzle);
-        }
+        $this->ghoutte = new GoutteWrapper($httpClient);
     }
 
     /**

diff --git a/src/Parser/Forum/ForumTopicParser.php b/src/Parser/Forum/ForumTopicParser.php
@@ -7,7 +7,6 @@
 use Jikan\Helper\Parser;
 use Jikan\Model\Forum\ForumPost;
 use Symfony\Component\DomCrawler\Crawler;
-use function GuzzleHttp\Psr7\parse_query;
 
 /**
  * Class ForumPostParser
@@ -37,7 +36,7 @@ public function __construct(Crawler $crawler)
      */
     public function getTopicId(): int
     {
-        $query = parse_query(explode('?', $this->getUrl())[1]);
+        parse_str(explode('?', $this->getUrl())[1], $query);
 
         return (int)$query['topicid'];
     }