Merge conflict

composer.json

@@ -2,11 +2,7 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
-<<<<<<< HEAD
     "version": "1.9.0",
-=======
-    "version": "1.8.1",
->>>>>>> master
     "type": "library",
     "require": {
         "php": ">=7.4|^8.0",

example/transactions/in3.php

@@ -60,11 +60,7 @@
             'identifier' => 'Articlenumber1',
             'type' => 'Physical',
             'description' => 'Blue Toy Car',
-<<<<<<< HEAD
             'category' => 'test product1',
-=======
-            'category' => 'test product',
->>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '2',
             'price' => '20.10',
@@ -73,11 +69,7 @@
             'identifier' => 'Articlenumber2',
             'type' => 'Physical',
             'description' => 'Red Toy Car',
-<<<<<<< HEAD
             'category' => 'test product2',
-=======
-            'category' => 'test product',
->>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '1',
             'price' => '10.10',
@@ -86,11 +78,7 @@
             'identifier' => 'USPShippingID',
             'type' => 'Physical',
             'description' => 'UPS',
-<<<<<<< HEAD
             'category' => 'test product3',
-=======
-            'category' => 'test product',
->>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '1',
             'price' => '2',

example/transactions/in3old.php

@@ -1,10 +1,5 @@
 <?php
-
-<<<<<<< HEAD
 require_once '../bootstrap.php';
-=======
-require('../bootstrap.php');
->>>>>>> master
 
 use Buckaroo\BuckarooClient;
 use Buckaroo\Resources\Constants\Gender;

example/transactions/payment_initiation.php

@@ -1,10 +1,5 @@
 <?php
-
-<<<<<<< HEAD
 require_once '../bootstrap.php';
-=======
-require('../bootstrap.php');
->>>>>>> master
 
 use Buckaroo\BuckarooClient;
 
@@ -24,8 +19,4 @@
     'invoice' => '', //Set invoice number of the transaction to refund
     'originalTransactionKey' => '', //Set transaction key of the transaction to refund
     'amountCredit' => 10,
-<<<<<<< HEAD
-]);
-=======
-]);
->>>>>>> master
+]);

src/PaymentMethods/In3/Service/ParameterKeys/PhoneAdapter.php

@@ -25,12 +25,6 @@
 class PhoneAdapter extends ServiceParametersKeysAdapter
 {
     protected array $keys = [
-<<<<<<< HEAD
         'mobile' => 'MobilePhone'
-=======
-        'landLine' => 'Phone',
-        'mobile' => 'MobilePhone',
-        'phone' => 'Phone'
->>>>>>> master
     ];
 }

src/PaymentMethods/In3Old/Service/ParameterKeys/PhoneAdapter.php

@@ -25,10 +25,6 @@
 class PhoneAdapter extends ServiceParametersKeysAdapter
 {
     protected array $keys = [
-<<<<<<< HEAD
         'mobile' => 'Phone'
-=======
-        'mobile' => 'Phone',
->>>>>>> master
     ];
 }