1.5.0 (#98)

* Request To Pay Payment method removed (#77) * Fixed an issue with getting issuers for iDeal (#78) Co-authored-by: Shu Chen <[email protected]> * Adding missing subscriptions parameters (#79) * Add missing parameters * Add docblock * Bancontact update & fixes (#80) * Add missing parameters * Add docblock * Add bancontact alias * Fix wrong naming to payrecurring and add payoneclick method * Return null when response data is not set (#81) * BP-2345 add return and push url in the i deal qr request in the php sdk (#83) * Return null when response data is not set * Add missing parameters * Update test and example * 1.3.1 * Changing the version * Merge conflict * Update changelog * Update changelog * Return string instead of int in subcode code (#88) * [Bugfixes] outdated subscription example (#90) * Return string instead of int in subcode code * Update subscription examples * Update Paypal test * GitHub/action psr12 and phplint validation (#92) * 1.4.0 (#86) * Request To Pay Payment method removed (#77) * Fixed an issue with getting issuers for iDeal (#78) Co-authored-by: Shu Chen <[email protected]> * Adding missing subscriptions parameters (#79) * Add missing parameters * Add docblock * Bancontact update & fixes (#80) * Add missing parameters * Add docblock * Add bancontact alias * Fix wrong naming to payrecurring and add payoneclick method * Return null when response data is not set (#81) * BP-2345 add return and push url in the i deal qr request in the php sdk (#83) * Return null when response data is not set * Add missing parameters * Update test and example * 1.3.1 * Changing the version * Merge conflict * Update changelog * Update changelog --------- Co-authored-by: reflie-nxte <[email protected]> * Added action * Added comment to trigger github action --------- Co-authored-by: Shu Chen <[email protected]> Co-authored-by: reflie-nxte <[email protected]> * Update ideal qr test (#94) * BP-2404 Feature/8.2 support (#95) * Update ideal qr test * Add group reference * Move tests folder * wip * Conform phpcs * Remove comments * Release 1.5.0 (#97) --------- Co-authored-by: reflie-nxte <[email protected]> Co-authored-by: avido <[email protected]>
buckaroo-it · Mar 23, 2023 · 94bb8e3 · 94bb8e3
1 parent 09495e2
commit 94bb8e3
Show file tree

Hide file tree

Showing 70 changed files with 275 additions and 173 deletions.
diff --git a/.env.example b/.env.example
@@ -1,12 +1,12 @@
-BPE_WEBSITE = "Example.com"
-BPE_WEBSITE_KEY = "KEY"
-BPE_SECRET_KEY = "SECRET"
-BPE_MODE = "test"
-BPE_DEBUG = true
-BPE_REPORT_ERROR = true
+BPE_WEBSITE="Example.com"
+BPE_WEBSITE_KEY="KEY"
+BPE_SECRET_KEY="SECRET"
+BPE_MODE="test"
+BPE_DEBUG=true
+BPE_REPORT_ERROR=true
 
-BPE_EXAMPLE_BASE_URL = "https://example.com/buckaroo/"
-BPE_EXAMPLE_RETURN_URL = "${BPE_EXAMPLE_BASE_URL}return"
-BPE_EXAMPLE_PUSH_URL = "${BPE_EXAMPLE_BASE_URL}push"
-BPE_EXAMPLE_IP = "127.0.0.1"
-BPE_EXAMPLE_CURRENCY_CODE = "EUR"
+BPE_EXAMPLE_BASE_URL="https://example.com/buckaroo/"
+BPE_EXAMPLE_RETURN_URL="${BPE_EXAMPLE_BASE_URL}return"
+BPE_EXAMPLE_PUSH_URL="${BPE_EXAMPLE_BASE_URL}push"
+BPE_EXAMPLE_IP="127.0.0.1"
+BPE_EXAMPLE_CURRENCY_CODE="EUR"
diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
@@ -0,0 +1,35 @@
+name: CheckStyleAndLint
+
+on:
+  pull_request:
+    paths:
+      - "src/**.php"
+      - "example/**.php"
+
+jobs:
+  phpcs:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.4, 8.1, 8.2]
+        stability: [prefer-stable]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: cs2pr, phplint, phpcs
+
+      - name: Run phplint
+        run: phplint --no-configuration --no-cache --no-interaction ./src/* ./example/*
+
+      - name: Run phpcs
+        run: phpcs -q --report=checkstyle --extensions=php ./src/* | cs2pr
diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Released]
 
+## [1.5.0]
+- BP-2351 Bugfix in transaction response in sub status code
+- Subscription example updated.
+- Github action added for PSR12 and PHPlint validation. Contributed by @avido
+- iDeal QR Test updated.
+- BP-2404 PHP 8.2 support
+
 ## [1.4.0]
 - Fixed an issue with getting issuers for iDEAL. Reported by @reflie-nxte
 - Add Bancontact alias and fixing typo in method name

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "type": "library",
     "require": {
         "php": ">=7.4|^8.0",
@@ -33,7 +33,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "BuckarooTests\\": "Tests/"
+            "Tests\\": "tests/"
         }
     }
 }
diff --git a/example/additional_services/subscriptions.php b/example/additional_services/subscriptions.php
@@ -9,28 +9,36 @@
 
 //** START Create Duo Combined */
 $subscriptions = $buckaroo->method('subscriptions')->manually()->createCombined([
+    'pushURL' => 'https://buckaroo.dev/push',
     'includeTransaction' => false,
     'transactionVatPercentage' => 5,
-    'configurationCode' => 'xxxxx',
+    'configurationCode' => 'gfyh9fe4',
     'email' => '[email protected]',
-    'rate_plans' => [
+    'ratePlans' => [
         'add' => [
-            'startDate' => date('Y-m-d'),
-            'ratePlanCode' => 'xxxxxx',
+            'startDate' => '2033-01-01',
+            'ratePlanCode' => '9863hdcj',
         ],
     ],
     'phone' => [
         'mobile' => '0612345678',
     ],
     'debtor' => [
-        'code' => 'xxxxxx',
+        'code' => 'johnsmith4',
     ],
-    'person' => [
-        'firstName' => 'John',
-        'lastName' => 'Do',
-        'gender' => Gender::FEMALE,
+//            'person'                    => [
+//                'firstName'         => 'John',
+//                'lastName'          => 'Do',
+//                'gender'            => Gender::FEMALE,
+//                'culture'           => 'nl-NL',
+//                'birthDate'         => '1990-01-01'
+//            ],
+    'company' => [
         'culture' => 'nl-NL',
-        'birthDate' => date('Y-m-d'),
+        'companyName' => 'My Company Coporation',
+        'vatApplicable' => true,
+        'vatNumber' => 'NL140619562B01',
+        'chamberOfCommerce' => '20091741',
     ],
     'address' => [
         'street' => 'Hoofdstraat',
@@ -50,28 +58,36 @@
 
 //** START Create Triple Combined */
 $subscriptions = $buckaroo->method('subscriptions')->manually()->createCombined([
+    'pushURL' => 'https://buckaroo.dev/push',
     'includeTransaction' => false,
     'transactionVatPercentage' => 5,
-    'configurationCode' => 'xxxxx',
+    'configurationCode' => 'gfyh9fe4',
     'email' => '[email protected]',
-    'rate_plans' => [
+    'ratePlans' => [
         'add' => [
-            'startDate' => date('Y-m-d'),
-            'ratePlanCode' => 'xxxxxx',
+            'startDate' => '2033-01-01',
+            'ratePlanCode' => '9863hdcj',
         ],
     ],
     'phone' => [
         'mobile' => '0612345678',
     ],
     'debtor' => [
-        'code' => 'xxxxxx',
+        'code' => 'johnsmith4',
     ],
-    'person' => [
-        'firstName' => 'John',
-        'lastName' => 'Do',
-        'gender' => Gender::FEMALE,
+//            'person'                    => [
+//                'firstName'         => 'John',
+//                'lastName'          => 'Do',
+//                'gender'            => Gender::FEMALE,
+//                'culture'           => 'nl-NL',
+//                'birthDate'         => '1990-01-01'
+//            ],
+    'company' => [
         'culture' => 'nl-NL',
-        'birthDate' => date('Y-m-d'),
+        'companyName' => 'My Company Coporation',
+        'vatApplicable' => true,
+        'vatNumber' => 'NL140619562B01',
+        'chamberOfCommerce' => '20091741',
     ],
     'address' => [
         'street' => 'Hoofdstraat',

diff --git a/example/bootstrap.php b/example/bootstrap.php
@@ -4,5 +4,6 @@
 
 require_once __DIR__ . "/../vendor/autoload.php";
 
+// Load env
 $dotenv = Dotenv::createImmutable(__DIR__ . "/../");
 $dotenv->load();
diff --git a/example/responses/push.php b/example/responses/push.php
@@ -41,7 +41,7 @@
 //START JSON PUSH
 $auth_header = 'IBjihN7Fhp:0YvyjYAzDQ28W+hQi80f2nhe0Z1QFJLbz7IH//6LsAU=:cad1832100784f57a6e6de835d9f3638:1658227572';
 $post_data = '{"Transaction":{"Key":"5340604668D74435AA344E1428ED1292","Invoice":"62d68b6c8ab0c","ServiceCode":"ideal","Status":{"Code":{"Code":190,"Description":"Success"},"SubCode":{"Code":"S001","Description":"Transaction successfully processed"},"DateTime":"2022-07-19T12:46:12"},"IsTest":true,"Order":"ORDER_NO_62d68b6ca2df3","Currency":"EUR","AmountDebit":10.1,"TransactionType":"C021","Services":[{"Name":"ideal","Action":null,"Parameters":[{"Name":"consumerIssuer","Value":"ABN AMRO"},{"Name":"transactionId","Value":"0000000000000001"},{"Name":"consumerName","Value":"J. de Tèster"},{"Name":"consumerIBAN","Value":"NL44RABO0123456789"},{"Name":"consumerBIC","Value":"RABONL2U"}],"VersionAsProperty":2}],"CustomParameters":null,"AdditionalParameters":{"List":[{"Name":"initiated_by_magento","Value":"1"},{"Name":"service_action","Value":"something"}]},"MutationType":1,"RelatedTransactions":null,"IsCancelable":false,"IssuingCountry":null,"StartRecurrent":false,"Recurring":false,"CustomerName":"J. de Tèster","PayerHash":"2d26d34584a4eafeeaa97eed10cfdae22ae64cdce1649a80a55fafca8850e3e22cb32eb7c8fc95ef0c6f96669a21651d4734cc568816f9bd59c2092911e6c0da","PaymentKey":"AEC974D455FF4A4B9B4C21E437A04838","Description":null}}';
-$uri = 'https://buckaroo.nextto.dev/push';
+$uri = 'https://buckaroo.dev/push';
 
 $reply_handler = new ReplyHandler($buckaroo->client()->config(), $post_data, $auth_header, $uri);
 $reply_handler->validate();

diff --git a/example/transactions/klarna.php b/example/transactions/klarna.php
@@ -1,4 +1,5 @@
 <?php
+
 require('../bootstrap.php');
 
 use Buckaroo\BuckarooClient;

diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Buckaroo_Coding_Standard">
+    <description>Buckaroo SDK coding standard.</description>
+
+    <file>src</file>
+
+    <rule ref="PSR2"/>
+
+    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis">
+        <exclude-pattern>*.php</exclude-pattern>
+    </rule>
+
+    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+        <exclude-pattern>src/PaymentMethods/iDeal/iDeal.php</exclude-pattern>
+        <exclude-pattern>src/PaymentMethods/iDealQR/iDealQR.php</exclude-pattern>
+    </rule>
+
+    <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword">src</exclude>
+
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite name="BuckarooSDK">
-            <directory>src/Tests/</directory>
+        <testsuite name="Unit tests">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -194,8 +194,7 @@ private function filterNonUpdatableKeys($payload)
     {
         $filter = ['websiteKey', 'secretKey'];
 
-        return array_filter($payload, function ($k) use ($filter)
-        {
+        return array_filter($payload, function ($k) use ($filter) {
             return ! in_array($k, $filter);
         }, ARRAY_FILTER_USE_KEY);
     }

diff --git a/src/Handlers/Credentials.php b/src/Handlers/Credentials.php
@@ -58,12 +58,9 @@ public function confirm(): bool
 
         $request = new TransactionRequest;
 
-        try
-        {
+        try {
             $response = $this->client->specification($request, 'ideal', 2);
-        }
-        catch (BuckarooException $e)
-        {
+        } catch (BuckarooException $e) {
             return false;
         }
 

diff --git a/src/Handlers/Logging/DefaultLogger.php b/src/Handlers/Logging/DefaultLogger.php
@@ -75,8 +75,7 @@ public function attach($observer)
      */
     public function detach(Observer $observer)
     {
-        $this->observers = array_filter($this->observers, function ($value) use ($observer)
-        {
+        $this->observers = array_filter($this->observers, function ($value) use ($observer) {
             return get_class($value) != get_class($observer);
         });
 

diff --git a/src/Handlers/Logging/Observers/Monolog.php b/src/Handlers/Logging/Observers/Monolog.php
@@ -5,9 +5,12 @@
 use Buckaroo\Handlers\Logging\Observer;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
+use Psr\Log\LoggerInterface;
 
 class Monolog implements Observer
 {
+    protected LoggerInterface $log;
+
     public function __construct()
     {
         $this->log = new Logger('Buckaroo log');

diff --git a/src/Handlers/Reply/HttpPost.php b/src/Handlers/Reply/HttpPost.php
@@ -51,8 +51,7 @@ public function __construct(Config $config, array $data)
     public function validate(): bool
     {
         //Remove brq_signature from the equation
-        $data = array_filter($this->data, function ($key)
-        {
+        $data = array_filter($this->data, function ($key) {
             $acceptable_top_level = ['brq', 'add', 'cust', 'BRQ', 'ADD', 'CUST'];
 
             return (
@@ -61,8 +60,7 @@ public function validate(): bool
         }, ARRAY_FILTER_USE_KEY);
 
         //Combine the array keys with value
-        $data = array_map(function ($value, $key)
-        {
+        $data = array_map(function ($value, $key) {
             return $key . '=' . html_entity_decode($value);
         }, $data, array_keys($data));
 

diff --git a/src/Handlers/Reply/ReplyHandler.php b/src/Handlers/Reply/ReplyHandler.php
@@ -118,12 +118,12 @@ private function contains(string $needle, array $data, bool $strict = false): bo
     {
         foreach (array_keys($data) as $key)
         {
-            if($strict && $key == $needle)
+            if ($strict && $key == $needle)
             {
                 return true;
             }
 
-            if(!$strict && str_contains($key, $needle))
+            if (! $strict && str_contains($key, $needle))
             {
                 return true;
             }

diff --git a/src/PaymentMethods/BuckarooVoucher/Models/Create.php b/src/PaymentMethods/BuckarooVoucher/Models/Create.php
@@ -24,6 +24,8 @@
 
 class Create extends ServiceParameter
 {
+    protected string $groupReference;
+
     protected string $usageType;
 
     protected string $validFrom;

diff --git a/src/PaymentMethods/PaymentFacade.php b/src/PaymentMethods/PaymentFacade.php
@@ -99,6 +99,11 @@ class PaymentFacade
      */
     private bool $isManually = false;
 
+    /**
+     * @var Client
+     */
+    protected Client $client;
+
     /**
      * @param Client $client
      * @param string $method

diff --git a/src/PaymentMethods/PaymentMethod.php b/src/PaymentMethods/PaymentMethod.php
@@ -28,6 +28,9 @@
 use Buckaroo\Transaction\Response\TransactionResponse;
 use Psr\Log\LoggerInterface;
 
+/**
+ *
+ */
 abstract class PaymentMethod implements PaymentInterface
 {
     /**
@@ -74,6 +77,11 @@ abstract class PaymentMethod implements PaymentInterface
      */
     protected bool $isManually = false;
 
+    /**
+     * @var string|null
+     */
+    protected ?string $serviceCode;
+
     /**
      * @param Client $client
      * @param string|null $serviceCode
@@ -185,8 +193,7 @@ public function combinePayment(Combinable $combinablePayment)
     {
         $this->combinablePayment = $combinablePayment;
 
-        $payload_data = array_filter($combinablePayment->request->data(), function ($key)
-        {
+        $payload_data = array_filter($combinablePayment->request->data(), function ($key) {
             return ! in_array($key, ['Services']);
         }, ARRAY_FILTER_USE_KEY);
 

diff --git a/src/PaymentMethods/Subscriptions/Models/Configuration.php b/src/PaymentMethods/Subscriptions/Models/Configuration.php
@@ -38,4 +38,4 @@ class Configuration extends ServiceParameter
      * @var bool
      */
     protected bool $skipPayPerEmail;
-}
+}
diff --git a/src/PaymentMethods/Subscriptions/Models/RatePlanCharge.php b/src/PaymentMethods/Subscriptions/Models/RatePlanCharge.php
@@ -74,4 +74,4 @@ class RatePlanCharge extends ServiceParameter
      * @var string
      */
     protected string $ratePlanChargeType;
-}
+}
diff --git a/src/PaymentMethods/Subscriptions/Models/Subscription.php b/src/PaymentMethods/Subscriptions/Models/Subscription.php
@@ -164,7 +164,7 @@ class Subscription extends ServiceParameter
             'groupType' => 'AddRatePlan',
         ],
         'configuration' => [
-            'groupType' => 'AddConfiguration'
+            'groupType' => 'AddConfiguration',
         ],
         'updateRatePlan' => [
             'groupType' => 'UpdateRatePlan',
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ class Configuration extends ServiceParameter @@
          * @var bool
          */
         protected bool $skipPayPerEmail;
-    }
+    }