add validation to test cases, fixed synchronous capture validation

Author: has.well

lib/Configuration.php

@@ -181,4 +181,4 @@ public static function getRequestType()
     {
         return self::$RequestType;
     }
-}
+}

lib/Helper/ResultHelper.php

@@ -12,7 +12,7 @@ class ResultHelper
      * @param $result
      * @param string $secretKey
      * @param string $ver
-     * @return bool|string
+     * @return bool
      */
     public static function isPaymentValid($result, $secretKey = '', $ver = '')
     {
@@ -26,7 +26,8 @@ public static function isPaymentValid($result, $secretKey = '', $ver = '')
         if ($ver == '') {
             $ver = Configuration::getApiVersion();
         }
-        if (!array_key_exists('signature', $result)) return 'Nothing to validate';
+        if (!array_key_exists('signature', $result))
+            return false;
         $signature = $result['signature'];
         if ($ver === '2.0') {
             $encoded = $result['encodedData'];
@@ -74,7 +75,7 @@ public static function isActiveMerchant(Array $result)
     public static function isPaymentApproved($data, $secretKey = '', $ver = '')
     {
         if (!isset($data['order_status']))
-            return 'Nothing to check';
+            return false;
         $valid = self::isPaymentValid($data, $secretKey, $ver);
         if ($valid && $data['order_status'] === 'approved')
             return true;
@@ -95,4 +96,4 @@ public function getVerifyStatus($data)
 
         return false;
     }
-}
+}

lib/Response/OrderResponse.php

@@ -30,24 +30,24 @@ public function isReversed()
     {
         $data = $this->buildVerifyData();
         if (!isset($data['reverse_status']))
-            return 'Nothing to check';
-        $valid = $this->isValid();
+            return false;
+        $valid = $this->isValid($data);
         if ($valid && $data['reverse_status'] === 'approved')
             return true;
 
         return false;
     }
 
     /**
-     * @return bool|string
-     * @throws \Exception
+     * @param bool $direct if synchronous call
+     * @return bool
      */
-    public function isCaptured()
+    public function isCaptured($direct = false)
     {
         $data = $this->buildVerifyData();
         if (!isset($data['capture_status']))
-            return 'Nothing to check';
-        $valid = $this->isValid();
+            return false;
+        $valid = $direct ? $direct : $this->isValid($data);
         if ($valid && $data['capture_status'] === 'captured')
             return true;
 
@@ -85,4 +85,4 @@ private function getCapturedTransAction()
         }
         return false;
     }
-}
+}

lib/Response/Response.php

@@ -155,11 +155,13 @@ public function isApproved()
 
     /**
      * Checking if order signature is valid
+     * @param null $data
      * @return bool
      */
-    public function isValid()
+    public function isValid($data = null)
     {
-        $data = $this->buildVerifyData();
+        if ($data == null)
+            $data = $this->buildVerifyData();
         return ResultHelper::isPaymentValid($data, $this->paymentKey, $this->apiVersion);
     }
 
@@ -175,4 +177,4 @@ protected function setKeyByOperationType($type = '')
             $this->paymentKey = Configuration::getSecretKey();
         }
     }
-}
+}

lib/Result/Result.php

@@ -137,7 +137,7 @@ public function isProcessing()
     {
         $data = $this->getData();
         if (!isset($data['order_status']))
-            return 'Nothing to check';
+            return false;
         $valid = $this->isValid();
         if ($valid && $data['order_status'] === 'processing')
             return true;
@@ -153,7 +153,7 @@ public function isDeclined()
     {
         $data = $this->getData();
         if (!isset($data['order_status']))
-            return 'Nothing to check';
+            return false;
         $valid = $this->isValid();
         if ($valid && $data['order_status'] === 'declined')
             return true;
@@ -169,12 +169,12 @@ public function isExpired()
     {
         $data = $this->getData();
         if (!isset($data['order_status']))
-            return 'Nothing to check';
+            return false;
         $valid = $this->isValid();
         if ($valid && $data['order_status'] === 'expired')
             return true;
 
         return false;
 
     }
-}
+}

tests/OrderTest.php

@@ -53,6 +53,8 @@ public function testStatus()
         $this->assertNotEmpty($result['order_id'], 'order_id is empty');
         $this->assertNotEmpty($result['order_status'], 'order_status is empty');
         $this->assertEquals($result['response_status'], 'success');
+        $this->assertEquals( true, $data->isApproved());
+        $this->assertEquals( true, $data->isValid());
 
     }
 
@@ -71,6 +73,7 @@ public function testCapture()
         $result = $data->getData();
         $this->assertIsMyArray($result);
         $this->assertEquals($result['capture_status'], 'captured');
+        $this->assertEquals(true, $data->isCaptured(true));
     }
 
     /**
@@ -89,6 +92,7 @@ public function testReverse()
         $this->assertNotEmpty($result['order_id'], 'order_id is empty');
         $this->assertEquals($result['response_status'], 'success');
         $this->assertEquals($result['reverse_status'], 'approved');
+        $this->assertEquals(true, $data->isReversed());
     }
 
     /**