Merge pull request #12 from TransactPRO/soft_declines

Add error codes for soft declines support; fix code style

Author: OlegGS

.github/workflows/php.yml

@@ -29,4 +29,4 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest
 
     - name: Run test suite
-      run: vendor/bin/phpunit tests
+      run: composer test

.travis.yml

@@ -1,3 +1,8 @@
+##### Version 2.0.0 (2021-04-23)
+
+        Add PHP 8 support in composer.json
+        Drop PHP 7.0 support
+
 ##### Version 1.7.2 (2020-09-02)
 
 	Add merchant-transaction-id to payment response parsing

CHANGELOG.md

@@ -61,7 +61,7 @@ if (!empty($paymentResponse->error)) {
 }
 
 // Redirect user to received URL
-if ($paymentResp->gw->statusCode === Status::CARD_FORM_URL_SENT) {
+if ($paymentResponse->gw->statusCode === Status::CARD_FORM_URL_SENT) {
     header("Location: {$paymentResponse->gw->redirectUrl}");
 }
 ```
@@ -104,7 +104,7 @@ $response = $gw->process($smsRequest);
 
 // Parse Gateway response as a payment response
 $paymentResponse = $sms->parseResponse($response);
-echo $paymentResp->gw->statusCode === Status::SUCCESS ? "SUCCESS" : "FAILED";
+echo $paymentResponse->gw->statusCode === Status::SUCCESS ? "SUCCESS" : "FAILED";
 ```
 
 ## Documentation
@@ -231,6 +231,16 @@ $message->useToken();
 $message->command()
     ->setPaymentMethodDataSource(Command::DATA_SOURCE_USE_GATEWAY_SAVED_CARDHOLDER_INITIATED)
     ->setPaymentMethodDataToken('<initial gateway-transaction-id>');
+
+$response = $gw->process($message);
+$paymentResponse = $message->parseResponse($response);
+if (
+    !empty($paymentResponse->error) &&
+    $paymentResponse->error->code === ErrorCode::EEC_ACQUIRER_SOFT_DECLINE &&
+    !empty($paymentResponse->gw->redirectUrl)
+) {
+    header("Location: {$paymentResponse->gw->redirectUrl}");
+}
 ```
 
 ### Callback validation

README.md

@@ -18,12 +18,15 @@
     "require-dev": {
         "phpunit/phpunit": "^6.0 | ^9.5",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "friendsofphp/php-cs-fixer": "^2.1"
+        "friendsofphp/php-cs-fixer": "^2.1",
+        "phpstan/phpstan": "^0.12"
     },
     "scripts": {
         "test": [
             "./vendor/bin/parallel-lint . --exclude vendor",
-            "./vendor/bin/phpunit"
+            "./vendor/bin/phpstan analyse --level 5 src tests",
+            "./vendor/bin/phpunit",
+            "./vendor/bin/php-cs-fixer fix --using-cache=false --dry-run"
         ],
         "cs": "./vendor/bin/php-cs-fixer fix --using-cache=false"
     }

composer.json

@@ -24,7 +24,6 @@ class RequestDigest extends Digest
      * @param string $username
      * @param string $secret
      * @param string $fullUrl
-     * @param string $qop
      *
      * @throws RequestException
      */

src/Gateway/Http/Crypto/RequestDigest.php

@@ -94,7 +94,7 @@ public function getData()
     /**
      * Set prepared JSON string.
      *
-     * @param $preparedData string
+     * @param string $preparedData
      */
     public function setPreparedData($preparedData)
     {

src/Gateway/Http/Request.php

@@ -44,7 +44,7 @@ class Curl implements HttpTransportInterface
     /**
      * cURL resource.
      *
-     * @var resource
+     * @var resource|null|false|mixed
      */
     private $ch;
 
@@ -217,7 +217,7 @@ public function getStatus(): int
      */
     public function close()
     {
-        if (is_resource($this->ch)) {
+        if (!empty($this->ch)) {
             curl_close($this->ch);
 
             $this->ch = null;

src/Gateway/Http/Transport/Curl.php

@@ -58,6 +58,7 @@ class ErrorCode
     const EEC_NO_PARENT_TRANSACTION_PROVIDED = 1157;
     const EEC_DYNAMIC_DESCRIPTOR_ERROR = 1158;
     const EEC_UCOF_ERROR = 1159;
+    const EEC_SUSPECTED_FRAUD = 1160;
 
     const EEC_TERMINAL_NOT_FOUND = 1200;
     const EEC_ALL_TERMINAL_COUNTERS_EXCEEDED = 1201;
@@ -69,6 +70,7 @@ class ErrorCode
 
     const EEC_DECLINED_BY_ACQUIRER = 1301;
     const EEC_ACQUIRER_ERROR = 1302;
+    const EEC_ACQUIRER_SOFT_DECLINE = 1303;
 
     const EEC_INVALID_FORM_ID = 1400;
     const EEC_FORM_UNAVAILABLE = 1401;

src/Gateway/Responses/Constants/ErrorCode.php

@@ -15,7 +15,7 @@
 
 class AuthTest extends TestCase
 {
-    public function testSuccess()
+    public function testSuccess(): void
     {
         $expected = [
             DataSet::AUTH_DATA_SESSION_ID => 'foo',
@@ -32,7 +32,7 @@ public function testSuccess()
         $this->assertEquals('aaaa', $auth->getSecretKey());
     }
 
-    public function testGetObjectId()
+    public function testGetObjectId(): void
     {
         $authAccount = new Auth();
         $authAccount->setAccountGUID('3383e58e-9cde-4ffa-85cf-81cd25b2423e');