Merge pull request #207 from Adyen/develop

Release 6.3.0
Adyen · Jun 26, 2020 · 97833db · 97833db
2 parents 852bd0d + 462aa2a
commit 97833db
Show file tree

Hide file tree

Showing 17 changed files with 308 additions and 27 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @msilvagarcia @cyattilakiss @Aleffio @AlexandrosMor @rikterbeek @acampos1916
+* @msilvagarcia @cyattilakiss @AlexandrosMor @acampos1916 @Aleffio @rikterbeek
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,21 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress
 
-      - name: Run test suite
+      - name: Run integration tests
+        run: vendor/bin/phpunit --testsuite=integration --no-coverage
+        env:
+          INTEGRATION_USERNAME: ${{ secrets.INTEGRATION_USERNAME }}
+          INTEGRATION_PASSWORD: ${{ secrets.INTEGRATION_PASSWORD }}
+          INTEGRATION_X_API_KEY: ${{ secrets.INTEGRATION_X_API_KEY }}
+          INTEGRATION_MERCHANT_ACCOUNT: ${{ secrets.INTEGRATION_MERCHANT_ACCOUNT }}
+          INTEGRATION_SKIN_CODE: ${{ secrets.INTEGRATION_SKIN_CODE }}
+          INTEGRATION_HMAC_SIGNATURE: ${{ secrets.INTEGRATION_HMAC_SIGNATURE }}
+          INTEGRATION_STORE_PAYOUT_USERNAME: ${{ secrets.INTEGRATION_STORE_PAYOUT_USERNAME }}
+          INTEGRATION_STORE_PAYOUT_PASSWORD: ${{ secrets.INTEGRATION_STORE_PAYOUT_PASSWORD }}
+          INTEGRATION_REVIEW_PAYOUT_USERNAME: ${{ secrets.INTEGRATION_REVIEW_PAYOUT_USERNAME }}
+          INTEGRATION_REVIEW_PAYOUT_PASSWORD: ${{ secrets.INTEGRATION_REVIEW_PAYOUT_PASSWORD }}
+
+      - name: Run unit tests
         run: vendor/bin/phpunit --testsuite=unit --coverage-clover build/clover.xml --log-junit build/tests-log.xml
 
       # PHPUnit generates absolute file paths and SonarCloud expects relative file paths. This command removes the

diff --git a/phpunit.xml b/phpunit.xml
@@ -30,6 +30,9 @@
         <testsuite name="unit">
             <directory>./tests/Unit</directory>
         </testsuite>
+        <testsuite name="integration">
+            <directory>./tests/Integration</directory>
+        </testsuite>
         <testsuite name="all">
             <directory>./tests</directory>
         </testsuite>

diff --git a/src/Adyen/Client.php b/src/Adyen/Client.php
@@ -10,7 +10,7 @@
 
 class Client
 {
-    const LIB_VERSION = "6.2.0";
+    const LIB_VERSION = "6.3.0";
     const LIB_NAME = "adyen-php-api-library";
     const USER_AGENT_SUFFIX = "adyen-php-api-library/";
     const ENDPOINT_TEST = "https://pal-test.adyen.com";

diff --git a/src/Adyen/Util/HmacSignature.php b/src/Adyen/Util/HmacSignature.php
@@ -27,6 +27,7 @@
 
 class HmacSignature
 {
+    const EVENT_CODE = "eventCode";
     /**
      * @param string $hmacKey Can be found in Customer Area
      * @param array $params The response from Adyen
@@ -69,7 +70,7 @@ private function getNotificationDataToSign($params)
         // `empty` treats too many value types as empty. `isset` should prevent some of these cases.
         $value = (isset($params['amount']['value'])) ? $params['amount']['value'] : "";
         $currency = (!empty($params['amount']['currency'])) ? $params['amount']['currency'] : "";
-        $eventCode = (!empty($params['eventCode'])) ? $params['eventCode'] : "";
+        $eventCode = (!empty($params[self::EVENT_CODE])) ? $params[self::EVENT_CODE] : "";
         $success = (!empty($params['success'])) ? $params['success'] : "";
 
         $dataToSign = array(
@@ -103,4 +104,59 @@ public function isValidNotificationHMAC($hmacKey, $params)
 
         return $expectedSign == $merchantSign;
     }
+    /**
+     * Returns true when the event code support HMAC validation
+     *
+     * @param $response
+     */
+    public function isHmacSupportedEventCode($response)
+    {
+        $eventCodes =  array(
+            "ADVICE_OF_DEBIT",
+            "AUTHORISATION",
+            "AUTHORISATION_PENDING",
+            "AUTHORISE_REFERRAL",
+            "CANCELLATION",
+            "CANCEL_OR_REFUND",
+            "CAPTURE",
+            "CAPTURE_FAILED",
+            "CAPTURE_WITH_EXTERNAL_AUTH",
+            "CHARGEBACK",
+            "CHARGEBACK_REVERSED",
+            "DEACTIVATE_RECURRING",
+            "FRAUD_ONLY",
+            "FUND_TRANSFER",
+            "HANDLED_EXTERNALLY",
+            "MANUAL_REVIEW_ACCEPT",
+            "NOTIFICATION_OF_CHARGEBACK",
+            "NOTIFICATION_OF_FRAUD",
+            "OFFER_CLOSED",
+            "ORDER_OPENED",
+            "PAIDOUT_REVERSED",
+            "PAYOUT_DECLINE",
+            "PAYOUT_EXPIRE",
+            "PAYOUT_THIRDPARTY",
+            "PREARBITRATION_LOST",
+            "PREARBITRATION_WON",
+            "PROCESS_RETRY",
+            "RECURRING_CONTRACT",
+            "REFUND",
+            "REFUNDED_REVERSED",
+            "REFUND_FAILED",
+            "REFUND_WITH_DATA",
+            "REQUEST_FOR_INFORMATION",
+            "SECOND_CHARGEBACK",
+            "SUBMIT_RECURRING",
+            "VOID_PENDING_REFUND",
+            "POSTPONED_REFUND",
+            "TECHNICAL_CANCEL",
+            "AUTHORISATION_ADJUSTMENT",
+            "CANCEL_AUTORESCUE",
+            "AUTORESCUE"
+        );
+        if (array_key_exists(self::EVENT_CODE, $response) && in_array($response[self::EVENT_CODE], $eventCodes)) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/tests/BinLookupTest.php → tests/Integration/BinLookupTest.php b/tests/BinLookupTest.php → tests/Integration/BinLookupTest.php
@@ -21,9 +21,10 @@
  *
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
 
-use Adyen\Util\Util;
+use Adyen\TestCase;
+use Adyen\Service;
 
 class BinLookupTest extends TestCase
 {

diff --git a/tests/CheckoutTest.php → tests/Integration/CheckoutTest.php b/tests/CheckoutTest.php → tests/Integration/CheckoutTest.php
@@ -21,8 +21,10 @@
  *
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
 
+use Adyen\TestCase;
+use Adyen\Service;
 use Adyen\Util\Uuid;
 
 class CheckoutTest extends TestCase

diff --git a/tests/CreatePaymentRequestTest.php → .../Integration/CreatePaymentRequestTest.php b/tests/CreatePaymentRequestTest.php → .../Integration/CreatePaymentRequestTest.php
@@ -1,6 +1,30 @@
 <?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen API Library for PHP
+ *
+ * Copyright (c) 2020 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ */
+
+namespace Adyen\Integration;
 
-namespace Adyen;
+use Adyen\TestCase;
+use Adyen\Service;
 
 /**
  * Created by PhpStorm.

diff --git a/tests/DirectoryLookupTest.php → tests/Integration/DirectoryLookupTest.php b/tests/DirectoryLookupTest.php → tests/Integration/DirectoryLookupTest.php
@@ -21,8 +21,10 @@
  *
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
 
+use Adyen\TestCase;
+use Adyen\Service;
 use Adyen\Util\Util;
 
 class DirectoryLookupTest extends TestCase

diff --git a/tests/ExceptionTest.php → tests/Integration/ExceptionTest.php b/tests/ExceptionTest.php → tests/Integration/ExceptionTest.php
@@ -1,12 +1,37 @@
 <?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen API Library for PHP
+ *
+ * Copyright (c) 2020 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ */
+
 /**
  * Created by PhpStorm.
  * User: rikt
  * Date: 11/18/15
  * Time: 12:01 PM
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
+
+use Adyen\TestCase;
+use Adyen\Service;
 
 class ExceptionTest extends \Adyen\TestCase
 {

diff --git a/tests/ModificationTest.php → tests/Integration/ModificationTest.php b/tests/ModificationTest.php → tests/Integration/ModificationTest.php
@@ -1,19 +1,44 @@
 <?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen API Library for PHP
+ *
+ * Copyright (c) 2020 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ */
+
 /**
  * Created by PhpStorm.
  * User: rikt
  * Date: 11/6/15
  * Time: 2:39 PM
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
+
+use Adyen\TestCase;
+use Adyen\Service;
 
 class ModificationTest extends TestCase
 {
     public function testCancelModification()
     {
         // create a payment
-        require_once __DIR__.'/CreatePaymentRequestTest.php';
+        require_once __DIR__ . '/CreatePaymentRequestTest.php';
         $test = new CreatePaymentRequestTest();
         $result = $test->testCreatePaymentSuccess();
 
@@ -33,7 +58,7 @@ public function testCancelModification()
     public function testRefundModification()
     {
         // create a payment
-        require_once __DIR__.'/CreatePaymentRequestTest.php';
+        require_once __DIR__ . '/CreatePaymentRequestTest.php';
         $test = new CreatePaymentRequestTest();
         $result = $test->testCreatePaymentSuccess();
 
@@ -63,7 +88,7 @@ public function testRefundModification()
     public function testAdjustDecreaseModification()
     {
         // create a payment
-        require_once __DIR__.'/CreatePaymentRequestTest.php';
+        require_once __DIR__ . '/CreatePaymentRequestTest.php';
         $test = new CreatePaymentRequestTest();
         $result = $test->testCreatePaymentSuccess();
 
@@ -90,7 +115,7 @@ public function testAdjustDecreaseModification()
     public function testAdjustIncreaseModification()
     {
         // create a payment
-        require_once __DIR__.'/CreatePaymentRequestTest.php';
+        require_once __DIR__ . '/CreatePaymentRequestTest.php';
         $test = new CreatePaymentRequestTest();
         $result = $test->testCreatePaymentSuccess();
 

diff --git a/tests/PayoutThirdPartyTest.php → tests/Integration/PayoutThirdPartyTest.php b/tests/PayoutThirdPartyTest.php → tests/Integration/PayoutThirdPartyTest.php
@@ -21,10 +21,23 @@
  *
  */
 
-namespace Adyen;
+namespace Adyen\Integration;
 
+use Adyen\TestCase;
+use Adyen\Service;
+
+/**
+ * Class PayoutThirdPartyTest
+ *
+ * @package Adyen\Integration
+ */
 class PayoutThirdPartyTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        $this->markTestIncomplete('Configure Payout accounts');
+    }
+
     public function testStoreDetailAndSubmitPayoutThirdPartyMissingReference()
     {
         // initialize client
@@ -326,7 +339,7 @@ public function testConfirmPayoutThirdPartyInvalidReference()
         // check if exception is correct
         $this->assertEquals('Adyen\AdyenException', get_class($e));
         $this->assertEquals(
-            'Invalid Request: Original pspReference is invalid for this environment!',
+            'Original pspReference required for this operation',
             $e->getMessage()
         );
     }
@@ -367,7 +380,7 @@ public function testDeclinePayoutThirdPartySuccess()
     public function testDeclinePayoutThirdPartyInvalidReference()
     {
         $this->expectException('Adyen\AdyenException');
-        $this->expectExceptionMessage('Invalid Request: Original pspReference is invalid for this environment!');
+        $this->expectExceptionMessage('Original pspReference required for this operation');
         // initialize client
         $client = $this->createReviewPayoutClient();
 

diff --git a/tests/PosPaymentTest.php → tests/Integration/PosPaymentTest.php b/tests/PosPaymentTest.php → tests/Integration/PosPaymentTest.php
@@ -1,8 +1,30 @@
 <?php
-
-namespace Adyen;
-
-use Adyen\Util\Util;
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen API Library for PHP
+ *
+ * Copyright (c) 2020 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ *
+ */
+
+namespace Adyen\Integration;
+
+use Adyen\TestCase;
+use Adyen\Service;
 
 class PosPaymentTest extends TestCase
 {