Skip to content

Commit 608043e

Browse files
authored
Merge branch 'main' into sdk-automation/payout
2 parents 426bffe + 75a53cd commit 608043e

File tree

8 files changed

+24
-20
lines changed

8 files changed

+24
-20
lines changed

src/Adyen/Model/BinLookup/Amount.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public function getCurrency()
299299
/**
300300
* Sets currency
301301
*
302-
* @param string $currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
302+
* @param string $currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the amount.
303303
*
304304
* @return self
305305
*/
@@ -323,7 +323,7 @@ public function getValue()
323323
/**
324324
* Sets value
325325
*
326-
* @param int $value The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
326+
* @param int $value The numeric value of the amount, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
327327
*
328328
* @return self
329329
*/

src/Adyen/Model/BinLookup/Recurring.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,10 @@ public function getModelName()
237237
}
238238

239239
public const CONTRACT_ONECLICK = 'ONECLICK';
240+
public const CONTRACT_ONECLICKRECURRING = 'ONECLICK,RECURRING';
240241
public const CONTRACT_RECURRING = 'RECURRING';
241242
public const CONTRACT_PAYOUT = 'PAYOUT';
243+
public const CONTRACT_EXTERNAL = 'EXTERNAL';
242244
public const TOKEN_SERVICE_VISATOKENSERVICE = 'VISATOKENSERVICE';
243245
public const TOKEN_SERVICE_MCTOKENSERVICE = 'MCTOKENSERVICE';
244246
public const TOKEN_SERVICE_AMEXTOKENSERVICE = 'AMEXTOKENSERVICE';
@@ -253,8 +255,10 @@ public function getContractAllowableValues()
253255
{
254256
return [
255257
self::CONTRACT_ONECLICK,
258+
self::CONTRACT_ONECLICKRECURRING,
256259
self::CONTRACT_RECURRING,
257260
self::CONTRACT_PAYOUT,
261+
self::CONTRACT_EXTERNAL,
258262
];
259263
}
260264
/**
@@ -366,7 +370,7 @@ public function getContract()
366370
/**
367371
* Sets contract
368372
*
369-
* @param string|null $contract The type of recurring contract to be used. Possible values: * `ONECLICK` – Payment details can be used to initiate a one-click payment, where the shopper enters the [card security code (CVC/CVV)](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-security-code-cvc-cvv-cid). * `RECURRING` – Payment details can be used without the card security code to initiate [card-not-present transactions](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-not-present-cnp). * `ONECLICK,RECURRING` – Payment details can be used regardless of whether the shopper is on your site or not. * `PAYOUT` – Payment details can be used to [make a payout](https://docs.adyen.com/online-payments/online-payouts).
373+
* @param string|null $contract The type of recurring contract to be used. Possible values: * `ONECLICK` – Payment details can be used to initiate a one-click payment, where the shopper enters the [card security code (CVC/CVV)](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-security-code-cvc-cvv-cid). * `RECURRING` – Payment details can be used without the card security code to initiate [card-not-present transactions](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-not-present-cnp). * `ONECLICK,RECURRING` – Payment details can be used regardless of whether the shopper is on your site or not. * `PAYOUT` – Payment details can be used to [make a payout](https://docs.adyen.com/online-payments/online-payouts). * `EXTERNAL` - Use this when you store payment details and send the raw card number or network token directly in your API request.
370374
*
371375
* @return self
372376
*/

src/Adyen/Model/DataProtection/ServiceError.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
namespace Adyen\Model\DataProtection;
1717

18-
use \ArrayAccess;
18+
use ArrayAccess;
1919
use Adyen\Model\DataProtection\ObjectSerializer;
2020

2121
/**
2222
* ServiceError Class Doc Comment
2323
*
2424
* @package Adyen
25-
* @implements \ArrayAccess<string, mixed>
25+
* @implements ArrayAccess<string, mixed>
2626
*/
2727
class ServiceError implements ModelInterface, ArrayAccess, \JsonSerializable
2828
{

src/Adyen/Model/DataProtection/SubjectErasureByPspReferenceRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
namespace Adyen\Model\DataProtection;
1717

18-
use \ArrayAccess;
18+
use ArrayAccess;
1919
use Adyen\Model\DataProtection\ObjectSerializer;
2020

2121
/**
2222
* SubjectErasureByPspReferenceRequest Class Doc Comment
2323
*
2424
* @package Adyen
25-
* @implements \ArrayAccess<string, mixed>
25+
* @implements ArrayAccess<string, mixed>
2626
*/
2727
class SubjectErasureByPspReferenceRequest implements ModelInterface, ArrayAccess, \JsonSerializable
2828
{

src/Adyen/Model/DataProtection/SubjectErasureResponse.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
namespace Adyen\Model\DataProtection;
1717

18-
use \ArrayAccess;
18+
use ArrayAccess;
1919
use Adyen\Model\DataProtection\ObjectSerializer;
2020

2121
/**
2222
* SubjectErasureResponse Class Doc Comment
2323
*
2424
* @package Adyen
25-
* @implements \ArrayAccess<string, mixed>
25+
* @implements ArrayAccess<string, mixed>
2626
*/
2727
class SubjectErasureResponse implements ModelInterface, ArrayAccess, \JsonSerializable
2828
{
@@ -321,11 +321,11 @@ public function setResult($result)
321321
{
322322
$allowedValues = $this->getResultAllowableValues();
323323
if (!in_array($result, $allowedValues, true)) {
324-
throw new \InvalidArgumentException(
324+
error_log(
325325
sprintf(
326-
"Invalid value '%s' for 'result', must be one of '%s'",
326+
"result: unexpected enum value '%s' - Supported values are [%s]",
327327
$result,
328-
implode("', '", $allowedValues)
328+
implode(', ', $allowedValues)
329329
)
330330
);
331331
}

src/Adyen/Model/Recurring/Amount.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public function getCurrency()
299299
/**
300300
* Sets currency
301301
*
302-
* @param string $currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
302+
* @param string $currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes) of the amount.
303303
*
304304
* @return self
305305
*/
@@ -323,7 +323,7 @@ public function getValue()
323323
/**
324324
* Sets value
325325
*
326-
* @param int $value The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
326+
* @param int $value The numeric value of the amount, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
327327
*
328328
* @return self
329329
*/

src/Adyen/Model/Recurring/Recurring.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,10 @@ public function getModelName()
237237
}
238238

239239
public const CONTRACT_ONECLICK = 'ONECLICK';
240+
public const CONTRACT_ONECLICKRECURRING = 'ONECLICK,RECURRING';
240241
public const CONTRACT_RECURRING = 'RECURRING';
241242
public const CONTRACT_PAYOUT = 'PAYOUT';
243+
public const CONTRACT_EXTERNAL = 'EXTERNAL';
242244
public const TOKEN_SERVICE_VISATOKENSERVICE = 'VISATOKENSERVICE';
243245
public const TOKEN_SERVICE_MCTOKENSERVICE = 'MCTOKENSERVICE';
244246
public const TOKEN_SERVICE_AMEXTOKENSERVICE = 'AMEXTOKENSERVICE';
@@ -253,8 +255,10 @@ public function getContractAllowableValues()
253255
{
254256
return [
255257
self::CONTRACT_ONECLICK,
258+
self::CONTRACT_ONECLICKRECURRING,
256259
self::CONTRACT_RECURRING,
257260
self::CONTRACT_PAYOUT,
261+
self::CONTRACT_EXTERNAL,
258262
];
259263
}
260264
/**
@@ -366,7 +370,7 @@ public function getContract()
366370
/**
367371
* Sets contract
368372
*
369-
* @param string|null $contract The type of recurring contract to be used. Possible values: * `ONECLICK` – Payment details can be used to initiate a one-click payment, where the shopper enters the [card security code (CVC/CVV)](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-security-code-cvc-cvv-cid). * `RECURRING` – Payment details can be used without the card security code to initiate [card-not-present transactions](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-not-present-cnp). * `ONECLICK,RECURRING` – Payment details can be used regardless of whether the shopper is on your site or not. * `PAYOUT` – Payment details can be used to [make a payout](https://docs.adyen.com/online-payments/online-payouts).
373+
* @param string|null $contract The type of recurring contract to be used. Possible values: * `ONECLICK` – Payment details can be used to initiate a one-click payment, where the shopper enters the [card security code (CVC/CVV)](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-security-code-cvc-cvv-cid). * `RECURRING` – Payment details can be used without the card security code to initiate [card-not-present transactions](https://docs.adyen.com/payments-fundamentals/payment-glossary#card-not-present-cnp). * `ONECLICK,RECURRING` – Payment details can be used regardless of whether the shopper is on your site or not. * `PAYOUT` – Payment details can be used to [make a payout](https://docs.adyen.com/online-payments/online-payouts). * `EXTERNAL` - Use this when you store payment details and send the raw card number or network token directly in your API request.
370374
*
371375
* @return self
372376
*/

src/Adyen/Service/RecurringApi.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(Client $client)
3636
parent::__construct($client);
3737

3838
// Create the baseUrl based on live/test and optional live-url-prefix
39-
$this->baseURL = $this->createBaseUrl("https://pal-test.adyen.com/pal/servlet/Recurring/v68");
39+
$this->baseURL = $this->createBaseUrl("https://paltokenization-test.adyen.com/pal/servlet/Recurring/v68");
4040
}
4141

4242
/**
@@ -58,7 +58,6 @@ public function createPermit(\Adyen\Model\Recurring\CreatePermitRequest $createP
5858
/**
5959
* Disable stored payment details
6060
*
61-
* @deprecated since Adyen Recurring API v68.
6261
* @param \Adyen\Model\Recurring\DisableRequest $disableRequest
6362
* @param array|null $requestOptions
6463
* @return \Adyen\Model\Recurring\DisableResult
@@ -90,7 +89,6 @@ public function disablePermit(\Adyen\Model\Recurring\DisablePermitRequest $disab
9089
/**
9190
* Get stored payment details
9291
*
93-
* @deprecated since Adyen Recurring API v68.
9492
* @param \Adyen\Model\Recurring\RecurringDetailsRequest $recurringDetailsRequest
9593
* @param array|null $requestOptions
9694
* @return \Adyen\Model\Recurring\RecurringDetailsResult
@@ -106,7 +104,6 @@ public function listRecurringDetails(\Adyen\Model\Recurring\RecurringDetailsRequ
106104
/**
107105
* Ask issuer to notify the shopper
108106
*
109-
* @deprecated since Adyen Recurring API v68.
110107
* @param \Adyen\Model\Recurring\NotifyShopperRequest $notifyShopperRequest
111108
* @param array|null $requestOptions
112109
* @return \Adyen\Model\Recurring\NotifyShopperResult
@@ -122,7 +119,6 @@ public function notifyShopper(\Adyen\Model\Recurring\NotifyShopperRequest $notif
122119
/**
123120
* Schedule running the Account Updater
124121
*
125-
* @deprecated since Adyen Recurring API v68.
126122
* @param \Adyen\Model\Recurring\ScheduleAccountUpdaterRequest $scheduleAccountUpdaterRequest
127123
* @param array|null $requestOptions
128124
* @return \Adyen\Model\Recurring\ScheduleAccountUpdaterResult

0 commit comments

Comments
 (0)