Merge pull request #82 from swisnl/bugfix/base-uri

Do not prepend the base uri if the endpoint is already absolute

Author: JaZo

src/Client.php

@@ -195,6 +195,10 @@ protected function buildRequest(string $method, string $endpoint, $body = null,
      */
     protected function getEndpoint(string $endpoint): string
     {
+        if (strpos($endpoint, 'http://') === 0 || strpos($endpoint, 'https://') === 0) {
+            return $endpoint;
+        }
+
         return $this->baseUri.$endpoint;
     }
 

tests/ClientTest.php

@@ -234,4 +234,38 @@ public function it_builds_requests_without_a_body()
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals('', (string) $httpClient->getLastRequest()->getBody());
     }
+
+    /**
+     * @test
+     */
+    public function it_prepends_the_base_uri_if_the_endpoint_is_relative()
+    {
+        $baseUri = 'http://example.com/api';
+        $endpoint = '/test/1';
+
+        $httpClient = new HttpMockClient();
+        $client = new Client($httpClient);
+        $client->setBaseUri($baseUri);
+
+        $client->get($endpoint);
+
+        $this->assertEquals($baseUri.$endpoint, $httpClient->getLastRequest()->getUri());
+    }
+
+    /**
+     * @test
+     */
+    public function it_does_not_prepend_the_base_uri_if_the_endpoint_is_already_absolute()
+    {
+        $baseUri = 'http://example.com/api';
+        $endpoint = 'http://foo.bar/test/1';
+
+        $httpClient = new HttpMockClient();
+        $client = new Client($httpClient);
+        $client->setBaseUri($baseUri);
+
+        $client->get($endpoint);
+
+        $this->assertEquals($endpoint, $httpClient->getLastRequest()->getUri());
+    }
 }