Improved base uri with api support

someline · Aug 24, 2016 · c9e26f7 · c9e26f7
1 parent 6e95bb7
commit c9e26f7
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Someline/Rest/RestClient.php b/src/Someline/Rest/RestClient.php
@@ -447,7 +447,7 @@ public function withoutOAuthToken()
     public function get($uri, array $query = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $this->printArray($options);
         $response = $this->client->get($uri, array_merge($options, [
             'query' => $query,
@@ -466,7 +466,7 @@ public function get($uri, array $query = [], array $options = [], $api = true)
     public function post($uri, array $data = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->post($uri, array_merge($options, [
             'form_params' => $data,
         ]));
@@ -485,7 +485,7 @@ public function post($uri, array $data = [], array $options = [], $api = true)
     public function postMultipart($uri, array $multipart = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->post($uri, array_merge($options, [
             'multipart' => $multipart,
         ]));
@@ -503,7 +503,7 @@ public function postMultipart($uri, array $multipart = [], array $options = [],
     public function postMultipartSimple($uri, array $data = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $multipart = [];
         foreach ($data as $key => $value) {
             $multipart[] = [
@@ -527,7 +527,7 @@ public function postMultipartSimple($uri, array $data = [], array $options = [],
      */
     public function head($uri, array $data = [], array $options = [], $api = true)
     {
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->head($uri, array_merge($options, [
             'body' => $data,
         ]));
@@ -545,7 +545,7 @@ public function head($uri, array $data = [], array $options = [], $api = true)
     public function put($uri, array $data = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->put($uri, array_merge($options, [
             'form_params' => $data,
         ]));
@@ -563,7 +563,7 @@ public function put($uri, array $data = [], array $options = [], $api = true)
     public function patch($uri, array $data = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->patch($uri, array_merge($options, [
             'form_params' => $data,
         ]));
@@ -581,7 +581,7 @@ public function patch($uri, array $data = [], array $options = [], $api = true)
     public function delete($uri, array $data = [], array $options = [], $api = true)
     {
         $options = $this->configureOptions($options);
-        $uri = $api ? $uri . $this->getServiceConfig('api_url') : $uri;
+        $uri = $api ? $this->getServiceConfig('api_url') . $uri : $uri;
         $response = $this->client->delete($uri, array_merge($options, [
             'form_params' => $data,
         ]));