Split getUrlContents (#864)

* Split getUrlContents

Since `getUrlContents()` takes the url as a string argument, it is not possible to set headers, such as `Accept-Language`, for the request. Therefore I created `getRequest()` to generate the request based on the url string, but without fetching the contents. Then headers can be added to the request, before the request is passed to `getRequestContents()` which fetches the content.

* Rename method

Author: Stadly

Provider/AbstractHttpProvider.php

@@ -19,6 +19,7 @@
 use Http\Message\MessageFactory;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Client\HttpClient;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * @author William Durand <[email protected]>
@@ -57,7 +58,32 @@ public function __construct(HttpClient $client, MessageFactory $factory = null)
      */
     protected function getUrlContents(string $url): string
     {
-        $request = $this->getMessageFactory()->createRequest('GET', $url);
+        $request = $this->getRequest($url);
+
+        return $this->getParsedResponse($request);
+    }
+
+    /**
+     * @param string $url
+     *
+     * @return RequestInterface
+     */
+    protected function getRequest(string $url): RequestInterface
+    {
+        return $this->getMessageFactory()->createRequest('GET', $url);
+    }
+
+    /**
+     * Send request and return contents. If content is empty, an exception will be thrown.
+     *
+     * @param RequestInterface $request
+     *
+     * @return string
+     *
+     * @throws InvalidServerResponse
+     */
+    protected function getParsedResponse(RequestInterface $request): string
+    {
         $response = $this->getHttpClient()->sendRequest($request);
 
         $statusCode = $response->getStatusCode();
@@ -66,12 +92,12 @@ protected function getUrlContents(string $url): string
         } elseif (429 === $statusCode) {
             throw new QuotaExceeded();
         } elseif ($statusCode >= 300) {
-            throw InvalidServerResponse::create($url, $statusCode);
+            throw InvalidServerResponse::create((string) $request->getUri(), $statusCode);
         }
 
         $body = (string) $response->getBody();
         if (empty($body)) {
-            throw InvalidServerResponse::emptyResponse($url);
+            throw InvalidServerResponse::emptyResponse((string) $request->getUri());
         }
 
         return $body;