Merge pull request #4 from DoclerLabs/fix-response-constructor-parame…

…ters

Fixed constructor parameter order in Response

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.0.2] - 2020-09-07
+### Fixed
+- construct parameter order in `Response`
+
 ## [3.0.1] - 2020-09-03
 ### Fixed
 - version in composer.json

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "docler-labs/api-client-base",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "description": "SDK Generator - API Client Base",
     "type": "library",
     "license": "MIT",

src/Response/Handler/ResponseHandler.php

@@ -41,12 +41,12 @@ public function handle(ResponseInterface $response): Response
 
         if ($statusCode >= 200 && $statusCode < 300) {
             if ($isResponseBodyEmpty) {
-                return new Response($statusCode, $headers);
+                return new Response($statusCode, null, $headers);
             }
 
             $decodedPayload = Json::decode($responseBody, true, 512, self::JSON_OPTIONS);
 
-            return new Response($statusCode, $headers, $decodedPayload);
+            return new Response($statusCode, $decodedPayload, $headers);
         }
 
         if ($statusCode === 400) {

src/Response/Response.php

@@ -8,30 +8,30 @@ class Response
     private $statusCode;
 
     /** @var array */
-    private $headers;
+    private $payload;
 
     /** @var array */
-    private $payload;
+    private $headers;
 
-    public function __construct(int $statusCode, array $headers = [], $payload = null)
+    public function __construct(int $statusCode, $payload = null, array $headers = [])
     {
         $this->statusCode = $statusCode;
-        $this->headers    = $headers;
         $this->payload    = $payload;
+        $this->headers    = $headers;
     }
 
     public function getStatusCode(): int
     {
         return $this->statusCode;
     }
 
-    public function getHeaders(): array
+    public function getPayload()
     {
-        return $this->headers;
+        return $this->payload;
     }
 
-    public function getPayload()
+    public function getHeaders(): array
     {
-        return $this->payload;
+        return $this->headers;
     }
 }

test/suite/unit/Response/ResponseTest.php

@@ -35,7 +35,7 @@ public function testFilled()
     {
         $body         = ['foo'];
         $headers      = ['bar'];
-        $responseData = new Response(2000, $headers, $body);
+        $responseData = new Response(2000, $body, $headers);
 
         self::assertSame(2000, $responseData->getStatusCode());
         self::assertSame($headers, $responseData->getHeaders());