Fix setting appended on responses

prinx · Apr 27, 2021 · bf0ab36 · bf0ab36
1 parent 41907eb
commit bf0ab36
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/Payswitch/MobileMoneyStatusCheckerResponse.php b/src/Payswitch/MobileMoneyStatusCheckerResponse.php
@@ -126,7 +126,7 @@ public function on($condition, $callback)
 
         foreach ($this->responses['data'] as $transactionId => $response) {
             $this->setCurrentResponseData($response->getResponse());
-            $this->setCurrentAppendedData($transactionId);
+            $this->setCurrentAppendedData($transactionId, $response);
 
             if ($isCustomCondition) {
                 $matchesCondition = $this->{'is'.ucfirst($condition)}();
@@ -389,13 +389,10 @@ public function populateCustomCurrentResponseDataNames()
         return $this->currentResponse;
     }
 
-    public function setCurrentAppendedData($transactionId)
+    public function setCurrentAppendedData($transactionId, $response)
     {
-        if (
-            $this->currentResponse instanceof MobileMoneyStatus &&
-            array_key_exists($transactionId, $this->appended)
-        ) {
-            $this->currentResponse->setAppended($this->appended[$transactionId]);
+        if (array_key_exists($transactionId, $this->appended)) {
+            $response->setAppended($this->appended[$transactionId]);
         }
     }
 
@@ -432,7 +429,7 @@ public function getResponses()
      */
     public function append(array $toAppend)
     {
-        $this->appended = array_merge($this->appended, $toAppend);
+        $this->appended = array_replace($this->appended, $toAppend);
 
         return $this;
     }