Merge branch 'release/3.0.11'

200MPH · Mar 7, 2021 · 6201df4 · 6201df4
2 parents 6c10d50 + 568c1fd
commit 6201df4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/service/TrackingService/TrackingResponse.php b/src/service/TrackingService/TrackingResponse.php
@@ -57,12 +57,8 @@ private function setConsignments()
 
         $this->consignments = [];
 
-        if (is_array($this->simpleXml->Consignment) === true) {
-            foreach ($this->simpleXml->Consignment as $cs) {
-                $this->consignments[] = new Consignment($cs);
-            }
-        } else {
-            $this->consignments[] = new Consignment($this->simpleXml->Consignment);
+        foreach ($this->simpleXml->Consignment as $cs) {
+            $this->consignments[] = new Consignment($cs);
         }
     }
 

diff --git a/src/service/TrackingService/TrackingService.php b/src/service/TrackingService/TrackingService.php
@@ -329,9 +329,9 @@ private function continueRequest($output)
             return false;
         }
 
-        $xml = new \SimpleXMLElement($output);
-
-        if (isset($xml->ContinuationKey) === true) {
+        $xml = simplexml_load_string($output);
+                    
+        if ($xml !== false && isset($xml->ContinuationKey) === true) {
             $this->xml->writeElement('ContinuationKey', $xml->ContinuationKey);
 
             return true;