Merge branch 'feature/improve-errors'

Webador · Jan 29, 2021 · 7fbb4b8 · 7fbb4b8
2 parents 18bbad5 + cf6ca5a
commit 7fbb4b8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/OP/Reply.php b/src/OP/Reply.php
@@ -27,15 +27,19 @@ protected function _parseReply ($str = '')
 
         $arr = OP_API::convertXmlToPhpObj($dom->documentElement);
 
-        if (!is_array($arr) || !array_key_exists('reply', $arr)) {
+        if (!is_array($arr)) {
             throw new OP_API_Exception(sprintf("Could not interpret response: %s", (string)$arr));
         }
 
         if (isset($arr['reply']['code']) && $arr['reply']['code'] == 4005) {
             throw new OP_API_Exception("API is temporarily unavailable due to maintenance", 4005);
         }
 
-        if (!array_key_exists('code', $arr['reply']) || !array_key_exists('desc', $arr['reply']) || !array_key_exists('data', $arr['reply'])) {
+        if (!array_key_exists('reply', $arr)
+         || !array_key_exists('code', $arr['reply'])
+         || !array_key_exists('desc', $arr['reply'])
+         || !array_key_exists('data', $arr['reply'])
+        ) {
             throw new OP_API_Exception(sprintf("Could not interpret response, missing mandatory fields. Response: %s", print_r($arr, true)));
         }