Fixed illegal string offset error in getXmlObjectFieldAttribute metho…

…ds, which occured in PHP 5.6
heidelpay · Apr 28, 2017 · acec8ba · acec8ba
1 parent 392742b
commit acec8ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/lib/Push.php b/lib/Push.php
@@ -100,7 +100,7 @@ public function __construct($xmlResponse = null)
      *
      * @param string $response
      */
-    public function setRawResponse(string $response)
+    public function setRawResponse($response)
     {
         $this->xmlResponse = $response;
     }

diff --git a/lib/PushMapping/Account.php b/lib/PushMapping/Account.php
@@ -48,8 +48,10 @@ public function getXmlObjectFieldAttribute(\SimpleXMLElement $xmlElement, $field
     {
         list($field, $attribute) = explode(':', $fieldAttribute);
 
-        if (isset($xmlElement->Transaction->Account->$field[$attribute])) {
-            return (string)$xmlElement->Transaction->Account->$field[$attribute];
+        if (isset($xmlElement->Transaction->Account->$field)) {
+            if (isset($xmlElement->Transaction->Account->$field->attributes()->$attribute)) {
+                return (string)$xmlElement->Transaction->Account->$field->attributes()->$attribute;
+            }
         }
 
         return null;

diff --git a/lib/PushMapping/Processing.php b/lib/PushMapping/Processing.php
@@ -50,8 +50,10 @@ public function getXmlObjectFieldAttribute(\SimpleXMLElement $xmlElement, $field
     {
         list($field, $attribute) = explode(':', $fieldAttribute);
 
-        if (isset($xmlElement->Transaction->Processing->$field[$attribute])) {
-            return (string)$xmlElement->Transaction->Processing->$field[$attribute];
+        if (isset($xmlElement->Transaction->Processing->$field)) {
+            if (isset($xmlElement->Transaction->Processing->$field->attributes()->$attribute)) {
+                return (string)$xmlElement->Transaction->Processing->$field->attributes()->$attribute;
+            }
         }
 
         return null;
@@ -60,15 +62,7 @@ public function getXmlObjectFieldAttribute(\SimpleXMLElement $xmlElement, $field
     public function getXmlObjectProperty(\SimpleXMLElement $xmlElement, $property)
     {
         if (isset($xmlElement->Transaction->Processing[$property])) {
-            $result = (string)$xmlElement->Transaction->Processing[$property];
-
-            // temporary solution: code in xml response contents too much, we cut it here.
-            if ($property == 'code') {
-                $codeRaw = explode('.', $result);
-                $result = $codeRaw[0] . '.' . $codeRaw[1];
-            }
-
-            return $result;
+            return (string)$xmlElement->Transaction->Processing[$property];
         }
 
         return null;