Merge pull request #9 from ratepay/bug/SHPWR-298_update_fix

[SHPWR-298] php 5.4 compatibility
ratepay · Jul 3, 2018 · 0d3a482 · 0d3a482
2 parents 6039bb8 + 1bc1625
commit 0d3a482
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Bootstrapping/Events/PaymentFilterSubscriber.php b/Bootstrapping/Events/PaymentFilterSubscriber.php
@@ -207,7 +207,12 @@ private function getRatePayPluginConfigByCountry($shopId, $country) {
      * @return bool
      */
     private function existsAndNotEmpty($method, $object) {
-        $check = (method_exists($object, $method) && !empty($object->$method()) && !is_null($object->$method()));
-        return $check;
+        if (method_exists($object, $method)) {
+            $var = $object->$method();
+            if (!empty($var) && !is_null($var)) {
+                return true;
+            }
+        }
+        return false;
     }
 }
diff --git a/Component/Mapper/ModelFactory.php b/Component/Mapper/ModelFactory.php
@@ -429,8 +429,13 @@ private function callPaymentRequest()
          * @return bool
          */
         private function existsAndNotEmpty(&$object, $method) {
-            $check = (method_exists($object, $method) && !empty($object->$method()) && !is_null($object->$method()));
-            return $check;
+            if (method_exists($object, $method)) {
+                $var = $object->$method();
+                if (!empty($var) && !is_null($var)) {
+                    return true;
+                }
+            }
+            return false;
         }
 
         /**