Parse json as array instead of object (#6)

jacobdekeizer · Sep 24, 2020 · 5079f65 · 5079f65
1 parent d51a707
commit 5079f65
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 55 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -69,15 +69,15 @@ public function __construct()
      * @param string $apiRoute
      * @param null|string $httpBody
      * @param array $requestHeaders
-     * @return string|object|null
+     * @return array
      * @throws RedJePakketjeException
      */
     public function doRequest(
         string $httpMethod,
         string $apiRoute,
         ?string $httpBody = null,
         array $requestHeaders = []
-    ) {
+    ): array {
         $url = self::BASE_ENDPOINT . '/' . $apiRoute;
 
         $response = $this->doRawRequest($httpMethod, $url, $httpBody, $requestHeaders);
@@ -88,20 +88,21 @@ public function doRequest(
 
         $body = $response->getBody()->getContents();
 
-        $object = @json_decode($body);
+        $data = @json_decode($body, true);
 
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new RedJePakketjeException('Unable to decode api response: ' . $body);
         }
 
         if ($response->getStatusCode() >= 400) {
             throw new RedJePakketjeException(
-                'Error executing api call: ' . $object->error_message . ', StatusCode: ' . $response->getStatusCode(),
+                'Error executing api call: ' . ($data['error_message'] ?? '')
+                    . ', StatusCode: ' . $response->getStatusCode(),
                 $response->getStatusCode()
             );
         }
 
-        return $object;
+        return $data;
     }
 
     /**

diff --git a/src/Endpoints/Contacts.php b/src/Endpoints/Contacts.php
@@ -14,9 +14,9 @@ class Contacts extends Base
      */
     public function all(): ContactsList
     {
-        $data = $this->client->doRequest('GET', 'contacts');
+        $response = $this->client->doRequest('GET', 'contacts');
 
-        return ContactsList::fromArray((array) $data);
+        return ContactsList::fromArray($response);
     }
 
     /**
@@ -28,9 +28,7 @@ public function create(Contact $contact): Contact
     {
         $response = $this->client->doRequest('POST', 'contacts', json_encode($contact->toRequest()));
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return Contact::fromArray((array) $data);
+        return Contact::fromArray($response['data'] ?? []);
     }
 
     /**
@@ -44,9 +42,7 @@ public function get(string $uuid): Contact
 
         $response = $this->client->doRequest('GET', $apiRoute);
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return Contact::fromArray((array) $data);
+        return Contact::fromArray($response['data']);
     }
 
     /**
@@ -60,8 +56,6 @@ public function update(Contact $contact): Contact
 
         $response = $this->client->doRequest('POST', $apiRoute, json_encode($contact->toRequest()));
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return Contact::fromArray((array) $data);
+        return Contact::fromArray($response['data'] ?? []);
     }
 }
diff --git a/src/Endpoints/CutOffTimes.php b/src/Endpoints/CutOffTimes.php
@@ -16,8 +16,6 @@ public function get(string $zipCode): CutOffTime
     {
         $response = $this->client->doRequest('POST', 'cut-off-times', json_encode(['zipcode' => $zipCode]));
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return CutOffTime::fromArray((array) $data);
+        return CutOffTime::fromArray($response['data'] ?? []);
     }
 }
diff --git a/src/Endpoints/PickUpPoints.php b/src/Endpoints/PickUpPoints.php
@@ -14,9 +14,9 @@ class PickUpPoints extends Base
      */
     public function all(): PickUpPointsList
     {
-        $data = $this->client->doRequest('GET', 'pick-up-points');
+        $response = $this->client->doRequest('GET', 'pick-up-points');
 
-        return PickUpPointsList::fromArray((array) $data);
+        return PickUpPointsList::fromArray($response);
     }
 
     /**
@@ -30,8 +30,6 @@ public function get(string $uuid): PickUpPoint
 
         $response = $this->client->doRequest('GET', $apiRoute);
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return PickUpPoint::fromArray((array) $data);
+        return PickUpPoint::fromArray($response['data']);
     }
 }
diff --git a/src/Endpoints/ReturnShipments.php b/src/Endpoints/ReturnShipments.php
@@ -19,9 +19,9 @@ public function all(?Parameters\All $parameter = null): ReturnShipmentsList
     {
         $apiRoute = 'shipments' . ($parameter ? $parameter->toQuery() : null);
 
-        $data = $this->client->doRequest('GET', $apiRoute);
+        $response = $this->client->doRequest('GET', $apiRoute);
 
-        return ReturnShipmentsList::fromArray((array) $data);
+        return ReturnShipmentsList::fromArray($response);
     }
 
     /**
@@ -35,9 +35,7 @@ public function get(string $uuid): ReturnShipmentResponse
 
         $response = $this->client->doRequest('GET', $apiRoute);
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return ReturnShipmentResponse::fromArray((array) $data);
+        return ReturnShipmentResponse::fromArray($response['data'] ?? []);
     }
 
     /**
@@ -49,8 +47,6 @@ public function create(ReturnShipment $returnShipment): ReturnShipmentResponse
     {
         $response = $this->client->doRequest('POST', 'return-shipments', json_encode($returnShipment->toRequest()));
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return ReturnShipmentResponse::fromArray((array) $data);
+        return ReturnShipmentResponse::fromArray($response['data'] ?? []);
     }
 }
diff --git a/src/Endpoints/Shipments.php b/src/Endpoints/Shipments.php
@@ -23,9 +23,9 @@ public function all(?Parameters\All $parameter = null): ShipmentsList
 
         $apiRoute = 'shipments' . $parameter->toQuery();
 
-        $data = $this->client->doRequest('GET', $apiRoute);
+        $response = $this->client->doRequest('GET', $apiRoute);
 
-        return ShipmentsList::fromArray((array) $data);
+        return ShipmentsList::fromArray($response);
     }
 
     /**
@@ -39,9 +39,7 @@ public function get(string $trackingCode): ShipmentResponse
 
         $response = $this->client->doRequest('GET', $apiRoute);
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return ShipmentResponse::fromArray((array) $data);
+        return ShipmentResponse::fromArray($response['data']);
     }
 
     /**
@@ -60,9 +58,7 @@ public function create(Shipment $shipment, ?Parameters\Create $parameter = null)
 
         $response = $this->client->doRequest('POST', $apiRoute, json_encode($shipment->toRequest()));
 
-        $data = ((array) $response)['data'] ?? [];
-
-        return ShipmentResponse::fromArray((array) $data);
+        return ShipmentResponse::fromArray($response['data'] ?? []);
     }
 
     /**

diff --git a/src/Resources/BaseList.php b/src/Resources/BaseList.php
@@ -203,8 +203,8 @@ public function setData(?array $data): BaseList
     {
         $this->data = [];
 
-        foreach ($data as $shipment) {
-            $this->data[] = $this->createDataResourceFromArray((array) $shipment);
+        foreach ($data as $item) {
+            $this->data[] = $this->createDataResourceFromArray($item);
         }
 
         return $this;

diff --git a/src/Resources/BaseSimpleList.php b/src/Resources/BaseSimpleList.php
@@ -42,8 +42,8 @@ public function setData(?array $data): BaseSimpleList
     {
         $this->data = [];
 
-        foreach ($data as $pickUpPoint) {
-            $this->data[] = $this->createDataResourceFromArray((array) $pickUpPoint);
+        foreach ($data as $item) {
+            $this->data[] = $this->createDataResourceFromArray($item);
         }
 
         return $this;

diff --git a/src/Resources/PickUpPoint.php b/src/Resources/PickUpPoint.php
@@ -317,7 +317,7 @@ public function getContact(): ?Contact
     protected function convertFromData(string $key, $value)
     {
         if ($key === 'contact' && $value !== null) {
-            return Contact::fromArray((array) $value);
+            return Contact::fromArray($value);
         }
 
         return $value;

diff --git a/src/Resources/ReturnShipment.php b/src/Resources/ReturnShipment.php
@@ -366,7 +366,7 @@ protected function covertToData(string $key, $value)
                 'uuid' => $value,
             ];
         } elseif ($key === 'product_options' && is_array($value)) {
-            return array_map(static function (ProductOption $productOption) {
+            return array_map(static function (ProductOption $productOption): array {
                 return $productOption->toRequest();
             }, $value);
         }

diff --git a/src/Resources/ReturnShipmentResponse.php b/src/Resources/ReturnShipmentResponse.php
@@ -62,8 +62,8 @@ public function getReturnAttempts(): ?array
     protected function convertFromData(string $key, $value)
     {
         if ($key === 'return_attempts' && is_array($value)) {
-            return array_map(static function ($data) {
-                return ReturnAttempt::fromArray((array) $data);
+            return array_map(static function (array $data): ReturnAttempt {
+                return ReturnAttempt::fromArray($data);
             }, $value);
         }
 

diff --git a/src/Resources/ReturnShipmentsList.php b/src/Resources/ReturnShipmentsList.php
@@ -14,6 +14,6 @@ class ReturnShipmentsList extends BaseList
      */
     protected function createDataResourceFromArray(array $data): Dto
     {
-        return ReturnShipmentResponse::fromArray((array) $data);
+        return ReturnShipmentResponse::fromArray($data);
     }
 }
diff --git a/src/Resources/Shipment.php b/src/Resources/Shipment.php
@@ -389,7 +389,7 @@ protected function covertToData(string $key, $value)
                 'uuid' => $value,
             ];
         } elseif ($key === 'product_options' && is_array($value)) {
-            return array_map(static function (ProductOption $productOption) {
+            return array_map(static function (ProductOption $productOption): array {
                 return $productOption->toRequest();
             }, $value);
         }

diff --git a/src/Resources/ShipmentResponse.php b/src/Resources/ShipmentResponse.php
@@ -624,14 +624,14 @@ public function getEvents(): ?array
     protected function convertFromData(string $key, $value)
     {
         if ($key === 'pick_up_point' && $value !== null) {
-            return PickUpPoint::fromArray((array) $value);
+            return PickUpPoint::fromArray($value);
         } elseif ($key === 'delivery_attempts' && is_array($value)) {
-            return array_map(static function ($data) {
-                return DeliveryAttempt::fromArray((array) $data);
+            return array_map(static function ($data): DeliveryAttempt {
+                return DeliveryAttempt::fromArray($data);
             }, $value);
         } elseif ($key === 'events' && is_array($value)) {
-            return array_map(static function ($data) {
-                return Event::fromArray((array) $data);
+            return array_map(static function ($data): Event {
+                return Event::fromArray($data);
             }, $value);
         }