Merge pull request #5 from cloudloyalty/fixes

Fixes

Author: luza

lib/Client.php

@@ -192,9 +192,11 @@ public function getServerAddress()
      */
     public function setServerAddress($serverAddress)
     {
-        $scheme = parse_url($this->serverAddress, PHP_URL_SCHEME);
-        $scheme = $scheme ? $scheme . '://' : 'https://';
-        $this->serverAddress = $scheme . trim($serverAddress, '/');
+        $scheme = parse_url($serverAddress, PHP_URL_SCHEME);
+        if (!$scheme) {
+            $serverAddress = 'https://' . $serverAddress;
+        }
+        $this->serverAddress = rtrim($serverAddress, '/');
         return $this;
     }
 
@@ -423,8 +425,18 @@ public function sendRawRequest($path, $rawBody)
 
         if ($this->logger instanceof LoggerInterface) {
             $this->logger->debug('Request', [
-                'request' => $request,
-                'response' => $response,
+                'request' => [
+                    'method' => $request->getMethod(),
+                    'uri' => $request->getUri(),
+                    'headers' => $request->getHeaders(),
+                    'body' => $request->getBody(),
+                ],
+                'response' => [
+                    'statusCode' => $response->getStatusCode(),
+                    'reasonPhrase' => $response->getReasonPhrase(),
+                    'headers' => $response->getHeaders(),
+                    'body' => $response->getBody(),
+                ],
             ]);
         }
 

lib/Http/Request.php

@@ -2,7 +2,7 @@
 
 namespace CloudLoyalty\Api\Http;
 
-class Request implements RequestInterface, \JsonSerializable
+class Request implements RequestInterface
 {
     /**
      * @var string
@@ -96,17 +96,4 @@ public function setBody($body)
         $this->body = $body;
         return $this;
     }
-
-    /**
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return [
-            'method' => $this->getMethod(),
-            'uri' => $this->getUri(),
-            'headers' => $this->getHeaders(),
-            'body' => $this->getBody(),
-        ];
-    }
 }

lib/Http/Response.php

@@ -2,7 +2,7 @@
 
 namespace CloudLoyalty\Api\Http;
 
-class Response implements ResponseInterface, \JsonSerializable
+class Response implements ResponseInterface
 {
     /**
      * @var int
@@ -96,17 +96,4 @@ public function setBody($body)
         $this->body = $body;
         return $this;
     }
-
-    /**
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return [
-            'statusCode' => $this->getStatusCode(),
-            'reasonPhrase' => $this->getReasonPhrase(),
-            'headers' => $this->getHeaders(),
-            'body' => $this->getBody(),
-        ];
-    }
 }

tests/ClientTest.php

@@ -137,13 +137,27 @@ public function testNewClientWhenCustomServerAddressSpecified()
         $apiClient->setServerAddress('api.someotherhost.com');
         $apiClient->setProcessingKey('test-key');
 
-        $apiClient->newClient(
-            (new NewClientRequest())
-                ->setClient(
-                    (new ClientInfoQuery())
-                        ->setName('Name')
-                )
-        );
+        $apiClient->newClient(new NewClientRequest());
+    }
+
+    public function testNewClientWhenCustomServerAddressWithSchemeSpecified()
+    {
+        $httpClientMock = $this->createMock('CloudLoyalty\Api\Http\Client\NativeClient');
+
+        $httpClientMock->expects($this->once())
+            ->method('sendRequest')
+            ->with($this->callback(function (Request $request) {
+                $this->assertEquals('ftp://api.someotherhost.com/new-client', $request->getUri());
+
+                return true;
+            }))
+            ->willReturn(new Response());
+
+        $apiClient = new Client([], $httpClientMock);
+        $apiClient->setServerAddress('ftp://api.someotherhost.com');
+        $apiClient->setProcessingKey('test-key');
+
+        $apiClient->newClient(new NewClientRequest());
     }
 
     public function testNewClientWhenPsrLoggerProvided()