Fix Promotion Model

Author: abed-t

src/Client.php

@@ -416,17 +416,13 @@ public function getOperatorsByCountryIso(string $countryIso, bool $suggestedAmou
         $operators = [];
 
         if ($response != null && $response->getContent() != null) {
-            foreach ($response->getContent() as $jsonCollection) {
 
-                if (!is_array($jsonCollection)) {
+            foreach ($response->getContent() as $operatorsResponse) {
 
-                    $operators[] = Operator::fromResponseData($jsonCollection);
+                if (!is_array($operatorsResponse)) continue;
 
-                }
-                else {
-                    foreach ($jsonCollection as $json) {
-                        $operators[] = Operator::fromResponseData($json);
-                    }
+                foreach ($operatorsResponse as $data) {
+                    $operators[] = Operator::fromResponseData($data);
                 }
             }
         }
@@ -452,17 +448,12 @@ public function getPromotions(int $page = 1, int $size = 50) : ?array {
         $promotions = [];
 
         if ($response != null && $response->getContent() != null) {
-            foreach ($response->getContent() as $jsonCollection) {
-
-                if (!is_array($jsonCollection)) {
+            foreach ($response->getContent() as $promotionsResponse) {
 
-                    $promotions[] = Promotion::fromResponseData($jsonCollection);
+                if (!is_array($promotionsResponse)) continue;
 
-                }
-                else {
-                    foreach ($jsonCollection as $json) {
-                        $promotions[] = Promotion::fromResponseData($json);
-                    }
+                foreach ($promotionsResponse as $data) {
+                    $promotions[] = Promotion::fromResponseData($data);
                 }
             }
         }
@@ -482,11 +473,11 @@ public function getPromotionsByCountryIso(string $country_iso) : ?array {
         $promotions = [];
 
         if ($response != null && $response->getContent() != null) {
-            foreach ($response->getContent() as $jsonCollection) {
-                if (!is_array($jsonCollection)) continue;
+            foreach ($response->getContent() as $promotionsResponse) {
+                if (!is_array($promotionsResponse)) continue;
 
-                foreach ($jsonCollection as $json) {
-                    $promotions[] = Promotion::fromResponseData($json);
+                foreach ($promotionsResponse as $data) {
+                    $promotions[] = Promotion::fromResponseData($data);
                 }
             }
         }
@@ -506,11 +497,11 @@ public function getPromotionsByOperator(int $operator_id) : ?array {
         $promotions = [];
 
         if ($response != null && $response->getContent() != null) {
-            foreach ($response->getContent() as $jsonCollection) {
-                if (!is_array($jsonCollection)) continue;
+            foreach ($response->getContent() as $promotionsResponse) {
+                if (!is_array($promotionsResponse)) continue;
 
-                foreach ($jsonCollection as $json) {
-                    $promotions[] = Promotion::fromResponseData($json);
+                foreach ($promotionsResponse as $data) {
+                    $promotions[] = Promotion::fromResponseData($data);
                 }
             }
         }
@@ -552,12 +543,11 @@ public function getTransactions(DateTimeInterface $start_date_time, DateTimeInte
         $transactions = [];
 
         if ($response != null && $response->getContent() != null) {
-            foreach ($response->getContent() as $jsonCollection) {
-
-                if (!is_array($jsonCollection)) continue;
+            foreach ($response->getContent() as $transactionsResponse) {
+                if (!is_array($transactionsResponse)) continue;
 
-                foreach ($jsonCollection as $json) {
-                    $transactions[] = Transaction::fromResponseData($json);
+                foreach ($transactionsResponse as $data) {
+                    $transactions[] = Transaction::fromResponseData($data);
                 }
             }
         }

src/Model/Promotion.php

@@ -40,6 +40,8 @@ class Promotion
 
     public static function fromResponseData($data) : ?Promotion
     {
+        if (!$data) return null;
+
         $promotion = new Promotion();
 
         foreach ($data as $key => $value) {
@@ -71,7 +73,7 @@ public function getPromotionId(): int
      * @param int $promotion_id
      * @return Promotion
      */
-    public function setPromotionId(int $promotion_id): Promotion
+    public function setPromotionId(?int $promotion_id): Promotion
     {
         $this->promotion_id = $promotion_id;
         return $this;
@@ -89,7 +91,7 @@ public function getOperatorId(): int
      * @param int $operator_id
      * @return Promotion
      */
-    public function setOperatorId(int $operator_id): Promotion
+    public function setOperatorId(?int $operator_id): Promotion
     {
         $this->operator_id = $operator_id;
         return $this;