Merge pull request #6 from weglot/fix/urls

Fix/Url placeholder replacement

Author: floranpagliai

Service/TextMasterApi.php

@@ -4,13 +4,12 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Handler\CurlHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\RequestOptions;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 class TextMasterApi
 {
@@ -57,7 +56,7 @@ public function __construct(string $apiKey, string $apiSecret, string $textmaste
     /**
      * @throws GuzzleException
      */
-    public function createProject(array $project): Response
+    public function createProject(array $project): ResponseInterface
     {
         $routeParams = self::ROUTES['createProject'];
 
@@ -67,18 +66,18 @@ public function createProject(array $project): Response
     /**
      * @throws GuzzleException
      */
-    public function updateProject(string $textMasterProjectId, array $options): Response
+    public function updateProject(string $textMasterProjectId, array $options): ResponseInterface
     {
         $routeParams = self::ROUTES['updateProject'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId]);
 
-        return $this->request($routeParams['url'], $routeParams['method'], ['project' => $options]);
+        return $this->request($url, $routeParams['method'], ['project' => $options]);
     }
 
     /**
      * @throws GuzzleException
      */
-    public function launchProject(string $textMasterProjectId): Response
+    public function launchProject(string $textMasterProjectId): ResponseInterface
     {
         $routeParams = self::ROUTES['launchProject'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId]);
@@ -89,7 +88,7 @@ public function launchProject(string $textMasterProjectId): Response
     /**
      * @throws GuzzleException
      */
-    public function addDocumentsToProject(string $textMasterProjectId, array $documents): Response
+    public function addDocumentsToProject(string $textMasterProjectId, array $documents): ResponseInterface
     {
         $routeParams = self::ROUTES['addDocument'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId]);
@@ -100,7 +99,7 @@ public function addDocumentsToProject(string $textMasterProjectId, array $docume
     /**
      * @throws GuzzleException
      */
-    public function completeDocument(string $documentId, string $textMasterProjectId): Response
+    public function completeDocument(string $documentId, string $textMasterProjectId): ResponseInterface
     {
         $routeParams = self::ROUTES['completeDocument'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId, '{documentId}' => $documentId]);
@@ -111,7 +110,7 @@ public function completeDocument(string $documentId, string $textMasterProjectId
     /**
      * @throws GuzzleException
      */
-    public function setProjectOptions(string $textMasterProjectId, array $options): Response
+    public function setProjectOptions(string $textMasterProjectId, array $options): ResponseInterface
     {
         $routeParams = self::ROUTES['setOptions'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId]);
@@ -122,7 +121,7 @@ public function setProjectOptions(string $textMasterProjectId, array $options):
     /**
      * @throws GuzzleException
      */
-    public function getProject(string $textMasterProjectId): Response
+    public function getProject(string $textMasterProjectId): ResponseInterface
     {
         $routeParams = self::ROUTES['getProject'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId]);
@@ -133,7 +132,7 @@ public function getProject(string $textMasterProjectId): Response
     /**
      * @throws GuzzleException
      */
-    public function getDocument(string $textMasterProjectId, string $textMasterDocumentId): Response
+    public function getDocument(string $textMasterProjectId, string $textMasterDocumentId): ResponseInterface
     {
         $routeParams = self::ROUTES['getDocument'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId, '{documentId}' => $textMasterDocumentId]);
@@ -144,7 +143,7 @@ public function getDocument(string $textMasterProjectId, string $textMasterDocum
     /**
      * @throws GuzzleException
      */
-    public function getProjectQuotation(array $project): Response
+    public function getProjectQuotation(array $project): ResponseInterface
     {
         $routeParams = self::ROUTES['getProjectQuotation'];
 
@@ -154,18 +153,17 @@ public function getProjectQuotation(array $project): Response
     /**
      * @throws GuzzleException
      */
-    public function getCategories(): Response
+    public function getCategories(): ResponseInterface
     {
         $routeParams = self::ROUTES['getCategories'];
-        $url = $this->formatUrl($routeParams['url'],[]);
 
-        return $this->request($url, $routeParams['method']);
+        return $this->request($routeParams['url'], $routeParams['method']);
     }
 
     /**
      * @throws GuzzleException
      */
-    public function getAbilities(string $page): Response
+    public function getAbilities(string $page): ResponseInterface
     {
         $routeParams = self::ROUTES['getAbilities'];
         $url = $this->formatUrl($routeParams['url'],['{page}' => $page]);
@@ -176,15 +174,15 @@ public function getAbilities(string $page): Response
     /**
      * @throws GuzzleException
      */
-    public function getAuthorsForProject(string $textMasterProjectId, string $status = 'my_textmaster'): Response
+    public function getAuthorsForProject(string $textMasterProjectId, string $status = 'my_textmaster'): ResponseInterface
     {
         $routeParams = self::ROUTES['getAuthorsForProject'];
         $url = $this->formatUrl($routeParams['url'], ['{projectId}' => $textMasterProjectId, '{status}' => $status]);
 
-        return $this->request($routeParams['url'], $routeParams['method']);
+        return $this->request($url, $routeParams['method']);
     }
 
-    public function extractErrorFromResponse(Response $response, string $format = 'html'): string
+    public function extractErrorFromResponse(ResponseInterface $response, string $format = 'html'): string
     {
         $errorMsg = '';
         $lineBreaker = 'html' === $format ? '</br>' : "\n";
@@ -205,12 +203,11 @@ public function extractErrorFromResponse(Response $response, string $format = 'h
     /**
      * @throws GuzzleException
      */
-    private function request(string $url, string $method, array $payload = []): Response
+    private function request(string $url, string $method, array $payload = []): ResponseInterface
     {
         $request = new Request($method, $url);
-        $response = $this->client->send($request, [RequestOptions::JSON => $payload]);
 
-        return $response;
+        return $this->client->send($request, [RequestOptions::JSON => $payload]);
     }
 
     private function createGuzzleClient(array $options): Client