type — Тип сделки. Фиксированное значение: safe_deal — Безопасная сделка;
- *
fee_moment — Момент перечисления вам вознаграждения платформы. Возможные значения: payment_succeeded — после успешной оплаты; deal_closed — при закрытии сделки после успешной выплаты.
+ *
fee_moment — Момент перечисления вам вознаграждения платформы. Возможные значения: payment_succeeded — после успешной оплаты;
+ *
deal_closed — при закрытии сделки после успешной выплаты.
*
*
* Дополнительные параметры:
*
- *
metadata — Любые дополнительные данные, которые нужны вам для работы (например, номер заказа);
+ *
metadata — Любые дополнительные данные, которые нужны вам для работы (например, ваш внутренний идентификатор заказа);
*
description — Описание сделки (не более 128 символов). Используется для фильтрации при получении списка сделок.
*
*
- * @example 01-client.php 299 18 Запрос на создание сделки
+ * @example 01-client.php 300 18 Запрос на создание сделки
*
* @param CreateDealRequestInterface|array $deal
* @param string|null $idempotenceKey [Ключ идемпотентности](https://yookassa.ru/developers/using-api/basics?lang=php#idempotence)
@@ -946,7 +957,7 @@ class Client extends BaseClient
* Запрос позволяет получить информацию о текущем состоянии сделки по её уникальному идентификатору.
* Выдает объект чека {@link DealInteface} в актуальном статусе.
*
- * @example 01-client.php 317 8 Получить информацию о сделке
+ * @example 01-client.php 320 8 Получить информацию о сделке
*
* @param string $dealId Идентификатор сделки
*
@@ -972,7 +983,7 @@ class Client extends BaseClient
throw new \InvalidArgumentException('Invalid dealId value');
}
- $path = self::DEALS_PATH.'/'.$dealId;
+ $path = self::DEALS_PATH . '/' . $dealId;
$response = $this->execute($path, HttpVerb::GET, null);
@@ -996,7 +1007,7 @@ class Client extends BaseClient
* Если результатов больше, чем задано в `limit`, список будет выводиться фрагментами.
* В этом случае в ответе на запрос вернется фрагмент списка и параметр `next_cursor` с указателем на следующий фрагмент.
*
- * @example 01-client.php 327 27 Получить список сделок с фильтрацией
+ * @example 01-client.php 330 27 Получить список сделок с фильтрацией
*
* @param DealsRequestInterface|array|null $filter
*
@@ -1061,7 +1072,7 @@ class Client extends BaseClient
*
*
description — описание транзакции (не более 128 символов);
*
deal — сделка, в рамках которой нужно провести выплату. Необходимо передавать, если вы проводите Безопасную сделку;
- *
metadata — любые дополнительные данные, которые нужны вам для работы (например, номер заказа).
+ *
metadata — любые дополнительные данные, которые нужны вам для работы (например, ваш внутренний идентификатор заказа).
*
*
* @param CreatePayoutRequestInterface|array $payout
@@ -1148,7 +1159,7 @@ class Client extends BaseClient
throw new InvalidPropertyValueTypeException('Invalid payoutId value: string required');
}
- $path = self::PAYOUTS_PATH.'/'.$payoutId;
+ $path = self::PAYOUTS_PATH . '/' . $payoutId;
$response = $this->execute($path, HttpVerb::GET, null);
@@ -1208,4 +1219,256 @@ class Client extends BaseClient
return $result;
}
+
+ /**
+ * Создание персональных данных
+ *
+ * Используйте этот запрос, чтобы создать в ЮKassa [объект персональных данных](#personal_data_object).
+ * В запросе необходимо передать фамилию, имя, отчество пользователя и указать, с какой целью эти данные будут использоваться.
+ * Идентификатор созданного объекта персональных данных необходимо использовать в запросе на проведение выплаты через СБП с проверкой получателя.
+ * [Подробнее о выплатах с проверкой получателя](/developers/payouts/scenario-extensions/recipient-check)
+ *
+ * @example 01-client.php 397 16 Запрос на создание персональных данных
+ *
+ * @param CreatePersonalDataRequestInterface|array $request
+ * @param string|null $idempotencyKey [Ключ идемпотентности](https://yookassa.ru/developers/using-api/basics?lang=php#idempotence)
+ *
+ * @return PersonalDataResponse|null Объект персональных данных
+ *
+ * @throws ApiException Неожиданный код ошибки.
+ * @throws BadApiRequestException Неправильный запрос. Чаще всего этот статус выдается из-за нарушения правил взаимодействия с API.
+ * @throws ForbiddenException Секретный ключ или OAuth-токен верный, но не хватает прав для совершения операции.
+ * @throws InternalServerError Технические неполадки на стороне ЮKassa. Результат обработки запроса неизвестен. Повторите запрос позднее с тем же ключом идемпотентности.
+ * @throws NotFoundException Ресурс не найден.
+ * @throws ResponseProcessingException Запрос был принят на обработку, но она не завершена.
+ * @throws TooManyRequestsException Превышен лимит запросов в единицу времени. Попробуйте снизить интенсивность запросов.
+ * @throws UnauthorizedException Неверное имя пользователя или пароль или невалидный OAuth-токен при аутентификации.
+ * @throws ExtensionNotFoundException Требуемое PHP расширение не установлено.
+ * @throws Exception
+ */
+ public function createPersonalData($request, $idempotencyKey = null)
+ {
+ $path = self::PERSONAL_DATA_PATH;
+
+ $headers = array();
+
+ if ($idempotencyKey) {
+ $headers[self::IDEMPOTENCY_KEY_HEADER] = $idempotencyKey;
+ } else {
+ $headers[self::IDEMPOTENCY_KEY_HEADER] = UUID::v4();
+ }
+ if (is_array($request)) {
+ $request = CreatePersonalDataRequest::builder()->build($request);
+ }
+
+ $serializer = new CreatePersonalDataRequestSerializer();
+ $serializedData = $serializer->serialize($request);
+ $httpBody = $this->encodeData($serializedData);
+
+ $response = $this->execute($path, HttpVerb::POST, array(), $httpBody, $headers);
+
+ $result = null;
+ if ($response->getCode() === 200) {
+ $resultArray = $this->decodeData($response);
+ $result = new PersonalDataResponse($resultArray);
+ } else {
+ $this->handleError($response);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Получить информацию о персональных данных
+ *
+ * Запрос позволяет получить информацию о текущем состоянии персональных данных по их уникальному идентификатору.
+ * Выдает объект платежа {@link PersonalDataInterface} в актуальном статусе.
+ *
+ * @example 01-client.php 415 8 Получить информацию о персональных данных
+ *
+ * @param string $personalDataId Идентификатор персональных данных
+ *
+ * @return PersonalDataInterface|null Объект персональных данных
+ *
+ * @throws ApiException Неожиданный код ошибки.
+ * @throws BadApiRequestException Неправильный запрос. Чаще всего этот статус выдается из-за нарушения правил взаимодействия с API.
+ * @throws ForbiddenException Секретный ключ или OAuth-токен верный, но не хватает прав для совершения операции.
+ * @throws InternalServerError Технические неполадки на стороне ЮKassa. Результат обработки запроса неизвестен. Повторите запрос позднее с тем же ключом идемпотентности.
+ * @throws NotFoundException Ресурс не найден.
+ * @throws ResponseProcessingException Запрос был принят на обработку, но она не завершена.
+ * @throws TooManyRequestsException Превышен лимит запросов в единицу времени. Попробуйте снизить интенсивность запросов.
+ * @throws UnauthorizedException Неверное имя пользователя или пароль или невалидный OAuth-токен при аутентификации.
+ * @throws ExtensionNotFoundException Требуемое PHP расширение не установлено.
+ */
+ public function getPersonalDataInfo($personalDataId)
+ {
+ if ($personalDataId === null) {
+ throw new \InvalidArgumentException('Missing the required parameter $personalDataId');
+ }
+ if (!TypeCast::canCastToString($personalDataId)) {
+ throw new \InvalidArgumentException('Invalid personalDataId value: string required');
+ }
+ if (mb_strlen($personalDataId) < PersonalDataInterface::MIN_LENGTH_ID || mb_strlen($personalDataId) > PersonalDataInterface::MAX_LENGTH_ID) {
+ throw new \InvalidArgumentException('Invalid personalDataId value');
+ }
+
+ $path = self::PERSONAL_DATA_PATH . '/' . $personalDataId;
+
+ $response = $this->execute($path, HttpVerb::GET, array());
+
+ $result = null;
+ if ($response->getCode() === 200) {
+ $resultArray = $this->decodeData($response);
+ $result = new PersonalDataResponse($resultArray);
+ } else {
+ $this->handleError($response);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Получить список участников СБП
+ *
+ * С помощью этого запроса вы можете получить актуальный список всех участников СБП.
+ * Список нужно вывести получателю выплаты, идентификатор выбранного участника СБП необходимо использовать
+ * в запросе на создание выплаты.
+ *
+ * @example 01-client.php 415 7 Получить информацию о персональных данных
+ *
+ * @return SbpBanksResponse|null
+ *
+ * @throws ApiException Неожиданный код ошибки.
+ * @throws BadApiRequestException Неправильный запрос. Чаще всего этот статус выдается из-за нарушения правил взаимодействия с API.
+ * @throws ForbiddenException Секретный ключ или OAuth-токен верный, но не хватает прав для совершения операции.
+ * @throws InternalServerError Технические неполадки на стороне ЮKassa. Результат обработки запроса неизвестен. Повторите запрос позднее с тем же ключом идемпотентности.
+ * @throws NotFoundException Ресурс не найден.
+ * @throws ResponseProcessingException Запрос был принят на обработку, но она не завершена.
+ * @throws TooManyRequestsException Превышен лимит запросов в единицу времени. Попробуйте снизить интенсивность запросов.
+ * @throws UnauthorizedException Неверное имя пользователя или пароль или невалидный OAuth-токен при аутентификации.
+ * @throws ExtensionNotFoundException Требуемое PHP расширение не установлено.
+ */
+ public function getSbpBanks()
+ {
+ $path = self::SBP_BANKS_PATH;
+
+ $response = $this->execute($path, HttpVerb::GET, array());
+
+ $result = null;
+ if ($response->getCode() === 200) {
+ $resultArray = $this->decodeData($response);
+ $result = new SbpBanksResponse($resultArray);
+ } else {
+ $this->handleError($response);
+ }
+
+ return $result;
+ }
+
+
+ /**
+ * Создание самозанятого.
+ *
+ * Используйте этот запрос, чтобы создать в ЮKassa [объект самозанятого](https://yookassa.ru/developers/api?codeLang=bash#self_employed_object).
+ *
+ * В запросе необходимо передать ИНН или телефон самозанятого для идентификации в сервисе Мой налог,
+ * сценарий подтверждения пользователем заявки ЮMoney на получение прав для регистрации чеков и описание самозанятого.
+ *
+ * Идентификатор созданного объекта самозанятого необходимо использовать в запросе на проведение выплаты.
+ *
+ * @example 01-client.php 425 14 Запрос на создание самозанятого
+ *
+ * @param SelfEmployedRequest|array $selfEmployed
+ * @param string|null $idempotenceKey [Ключ идемпотентности](https://yookassa.ru/developers/using-api/basics?lang=php#idempotence)
+ *
+ * @return SelfEmployedResponse|null
+ *
+ * @throws ApiException Неожиданный код ошибки.
+ * @throws BadApiRequestException Неправильный запрос. Чаще всего этот статус выдается из-за нарушения правил взаимодействия с API.
+ * @throws ForbiddenException Секретный ключ или OAuth-токен верный, но не хватает прав для совершения операции.
+ * @throws InternalServerError Технические неполадки на стороне ЮKassa. Результат обработки запроса неизвестен. Повторите запрос позднее с тем же ключом идемпотентности.
+ * @throws NotFoundException Ресурс не найден.
+ * @throws ResponseProcessingException Запрос был принят на обработку, но она не завершена.
+ * @throws TooManyRequestsException Превышен лимит запросов в единицу времени. Попробуйте снизить интенсивность запросов.
+ * @throws UnauthorizedException Неверное имя пользователя или пароль или невалидный OAuth-токен при аутентификации.
+ * @throws ExtensionNotFoundException Требуемое PHP расширение не установлено.
+ */
+ public function createSelfEmployed($selfEmployed, $idempotenceKey = null)
+ {
+ $path = self::SELF_EMPLOYED_PATH;
+
+ $headers = array();
+
+ if ($idempotenceKey) {
+ $headers[self::IDEMPOTENCY_KEY_HEADER] = $idempotenceKey;
+ } else {
+ $headers[self::IDEMPOTENCY_KEY_HEADER] = UUID::v4();
+ }
+
+ $request = is_array($selfEmployed) ? SelfEmployedRequest::builder()->build($selfEmployed) : $selfEmployed;
+
+ $serializer = new SelfEmployedRequestSerializer();
+ $serializedData = $serializer->serialize($request);
+ $httpBody = $this->encodeData($serializedData);
+
+ $response = $this->execute($path, HttpVerb::POST, array(), $httpBody, $headers);
+
+ $result = null;
+ if ($response->getCode() === 200) {
+ $resultArray = $this->decodeData($response);
+ $result = new SelfEmployedResponse($resultArray);
+ } else {
+ $this->handleError($response);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Получить информацию о самозанятом
+ *
+ * С помощью этого запроса вы можете получить информацию о текущем статусе самозанятого по его уникальному идентификатору.
+ *
+ * @example 01-client.php 441 8 Получить информацию о самозанятом
+ *
+ * @param string $selfEmployedId Идентификатор самозанятого
+ *
+ * @return SelfEmployedInterface|null Объект информации о самозанятом
+ *
+ * @throws ApiException Неожиданный код ошибки.
+ * @throws BadApiRequestException Неправильный запрос. Чаще всего этот статус выдается из-за нарушения правил взаимодействия с API.
+ * @throws ForbiddenException Секретный ключ или OAuth-токен верный, но не хватает прав для совершения операции.
+ * @throws InternalServerError Технические неполадки на стороне ЮKassa. Результат обработки запроса неизвестен. Повторите запрос позднее с тем же ключом идемпотентности.
+ * @throws NotFoundException Ресурс не найден.
+ * @throws ResponseProcessingException Запрос был принят на обработку, но она не завершена.
+ * @throws TooManyRequestsException Превышен лимит запросов в единицу времени. Попробуйте снизить интенсивность запросов.
+ * @throws UnauthorizedException Неверное имя пользователя или пароль или невалидный OAuth-токен при аутентификации.
+ * @throws ExtensionNotFoundException Требуемое PHP расширение не установлено.
+ */
+ public function getSelfEmployedInfo($selfEmployedId)
+ {
+ if ($selfEmployedId === null) {
+ throw new \InvalidArgumentException('Missing the required parameter $selfEmployedId');
+ }
+ if (!TypeCast::canCastToString($selfEmployedId)) {
+ throw new \InvalidArgumentException('Invalid selfEmployedId value: string required');
+ }
+ if (mb_strlen($selfEmployedId) < SelfEmployedInterface::MIN_LENGTH_ID || mb_strlen($selfEmployedId) > SelfEmployedInterface::MAX_LENGTH_ID) {
+ throw new \InvalidArgumentException('Invalid selfEmployedId value');
+ }
+
+ $path = self::SELF_EMPLOYED_PATH . '/' . $selfEmployedId;
+
+ $response = $this->execute($path, HttpVerb::GET, array());
+
+ $result = null;
+ if ($response->getCode() === 200) {
+ $resultArray = $this->decodeData($response);
+ $result = new SelfEmployedResponse($resultArray);
+ } else {
+ $this->handleError($response);
+ }
+
+ return $result;
+ }
}
diff --git a/lib/Client/ApiClientInterface.php b/lib/Client/ApiClientInterface.php
index 916c6716..9ee10686 100644
--- a/lib/Client/ApiClientInterface.php
+++ b/lib/Client/ApiClientInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Client/BaseClient.php b/lib/Client/BaseClient.php
index f12cc24a..3049d188 100644
--- a/lib/Client/BaseClient.php
+++ b/lib/Client/BaseClient.php
@@ -1,8 +1,9 @@
setCurlOption(CURLOPT_CUSTOMREQUEST, $method);
- if(!empty($httpBody)) {
+ if (!empty($httpBody)) {
$this->setCurlOption(CURLOPT_POSTFIELDS, $httpBody);
}
}
@@ -413,7 +413,7 @@ class CurlClient implements ApiClientInterface
if ($this->shopId && $this->shopPassword) {
$encodedAuth = base64_encode($this->shopId . ':' . $this->shopPassword);
$headers['Authorization'] = 'Basic ' . $encodedAuth;
- } else if ($this->bearerToken) {
+ } elseif ($this->bearerToken) {
$headers['Authorization'] = 'Bearer ' . $this->bearerToken;
}
@@ -430,7 +430,9 @@ class CurlClient implements ApiClientInterface
*/
private function implodeHeaders($headers)
{
- return array_map(function ($key, $value) { return $key . ':' . $value; }, array_keys($headers), $headers);
+ return array_map(function ($key, $value) {
+ return $key . ':' . $value;
+ }, array_keys($headers), $headers);
}
/**
diff --git a/lib/Client/UserAgent.php b/lib/Client/UserAgent.php
index a840bb51..be2c3a29 100644
--- a/lib/Client/UserAgent.php
+++ b/lib/Client/UserAgent.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Client;
-
use YooKassa\Client;
/**
@@ -346,5 +345,4 @@ class UserAgent
. self::VERSION_DELIMITER
. str_replace(array(self::PART_DELIMITER, self::VERSION_DELIMITER), '.', trim($version));
}
-
}
diff --git a/lib/Common/AbstractEnum.php b/lib/Common/AbstractEnum.php
index efd5062c..7e17adc4 100644
--- a/lib/Common/AbstractEnum.php
+++ b/lib/Common/AbstractEnum.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/AbstractObject.php b/lib/Common/AbstractObject.php
index 97f2cc65..07ca827e 100644
--- a/lib/Common/AbstractObject.php
+++ b/lib/Common/AbstractObject.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -90,11 +90,11 @@ abstract class AbstractObject implements \ArrayAccess, \JsonSerializable
{
$method = 'get' . ucfirst($offset);
if (method_exists($this, $method)) {
- return $this->{$method} ();
+ return $this->{$method}();
}
$method = 'get' . self::matchPropertyName($offset);
if (method_exists($this, $method)) {
- return $this->{$method} ();
+ return $this->{$method}();
}
return array_key_exists($offset, $this->unknownProperties) ? $this->unknownProperties[$offset] : null;
}
@@ -131,11 +131,11 @@ abstract class AbstractObject implements \ArrayAccess, \JsonSerializable
{
$method = 'set' . ucfirst($offset);
if (method_exists($this, $method)) {
- $this->{$method} (null);
+ $this->{$method}(null);
} else {
$method = 'set' . self::matchPropertyName($offset);
if (method_exists($this, $method)) {
- $this->{$method} (null);
+ $this->{$method}(null);
} else {
unset($this->unknownProperties[$offset]);
}
@@ -219,7 +219,7 @@ abstract class AbstractObject implements \ArrayAccess, \JsonSerializable
continue;
}
$property = strtolower(preg_replace('/[A-Z]/', '_\0', lcfirst(substr($method, 3))));
- $value = $this->serializeValueToJson($this->{$method} ());
+ $value = $this->serializeValueToJson($this->{$method}());
if ($value !== null) {
$result[$property] = $value;
}
diff --git a/lib/Common/AbstractPaymentRequest.php b/lib/Common/AbstractPaymentRequest.php
index ebea4b94..2551134b 100644
--- a/lib/Common/AbstractPaymentRequest.php
+++ b/lib/Common/AbstractPaymentRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -234,5 +234,4 @@ class AbstractPaymentRequest extends AbstractRequest
return true;
}
-
}
diff --git a/lib/Common/AbstractPaymentRequestBuilder.php b/lib/Common/AbstractPaymentRequestBuilder.php
index d3d10bbe..42cc21de 100644
--- a/lib/Common/AbstractPaymentRequestBuilder.php
+++ b/lib/Common/AbstractPaymentRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -193,18 +193,18 @@ abstract class AbstractPaymentRequestBuilder extends AbstractRequestBuilder
} else {
if (empty($item['title']) && empty($item['description'])) {
throw new InvalidPropertyValueException(
- 'Item#'.$index.' title or description not specified',
+ 'Item#' . $index . ' title or description not specified',
0,
- 'AbstractPaymentRequestBuilder.items['.$index.'].title',
+ 'AbstractPaymentRequestBuilder.items[' . $index . '].title',
json_encode($item)
);
}
foreach (array('price', 'quantity', 'vatCode') as $property) {
if (empty($item[$property])) {
throw new InvalidPropertyValueException(
- 'Item#'.$index.' '.$property.' not specified',
+ 'Item#' . $index . ' ' . $property . ' not specified',
0,
- 'AbstractPaymentRequestBuilder.items['.$index.'].'.$property,
+ 'AbstractPaymentRequestBuilder.items[' . $index . '].' . $property,
json_encode($item)
);
}
diff --git a/lib/Common/AbstractRefundRequest.php b/lib/Common/AbstractRefundRequest.php
index c5955a31..9daca004 100644
--- a/lib/Common/AbstractRefundRequest.php
+++ b/lib/Common/AbstractRefundRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -91,19 +91,27 @@ class AbstractRefundRequest extends AbstractRequest
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty payment id value in CreateRefundRequest', 0, 'CreateRefundRequest.paymentId'
+ 'Empty payment id value in CreateRefundRequest',
+ 0,
+ 'CreateRefundRequest.paymentId'
);
} elseif (TypeCast::canCastToString($value)) {
$length = mb_strlen($value, 'utf-8');
if ($length != 36) {
throw new InvalidPropertyValueException(
- 'Invalid payment id value in CreateRefundRequest', 0, 'CreateRefundRequest.paymentId', $value
+ 'Invalid payment id value in CreateRefundRequest',
+ 0,
+ 'CreateRefundRequest.paymentId',
+ $value
);
}
$this->_paymentId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment id value type in CreateRefundRequest', 0, 'CreateRefundRequest.paymentId', $value
+ 'Invalid payment id value type in CreateRefundRequest',
+ 0,
+ 'CreateRefundRequest.paymentId',
+ $value
);
}
}
@@ -219,5 +227,4 @@ class AbstractRefundRequest extends AbstractRequest
return true;
}
-
}
diff --git a/lib/Common/AbstractRequest.php b/lib/Common/AbstractRequest.php
index bb34df36..f642954c 100644
--- a/lib/Common/AbstractRequest.php
+++ b/lib/Common/AbstractRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/AbstractRequestBuilder.php b/lib/Common/AbstractRequestBuilder.php
index d785f390..0a50f0ac 100644
--- a/lib/Common/AbstractRequestBuilder.php
+++ b/lib/Common/AbstractRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -104,13 +104,13 @@ abstract class AbstractRequestBuilder
foreach ($options as $property => $value) {
$method = 'set' . ucfirst($property);
if (method_exists($this, $method)) {
- $this->{$method} ($value);
+ $this->{$method}($value);
} else {
$property = str_replace('.', '_', $property);
$field = implode('', array_map('ucfirst', explode('_', $property)));
$method = 'set' . ucfirst($field);
if (method_exists($this, $method)) {
- $this->{$method} ($value);
+ $this->{$method}($value);
}
}
}
diff --git a/lib/Common/Exceptions/ApiConnectionException.php b/lib/Common/Exceptions/ApiConnectionException.php
index 5c2b6518..0851f459 100644
--- a/lib/Common/Exceptions/ApiConnectionException.php
+++ b/lib/Common/Exceptions/ApiConnectionException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -28,5 +28,4 @@ namespace YooKassa\Common\Exceptions;
class ApiConnectionException extends ApiException
{
-
}
diff --git a/lib/Common/Exceptions/ApiException.php b/lib/Common/Exceptions/ApiException.php
index 2faeee3e..051a12b4 100644
--- a/lib/Common/Exceptions/ApiException.php
+++ b/lib/Common/Exceptions/ApiException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/AuthorizeException.php b/lib/Common/Exceptions/AuthorizeException.php
index 29478fa9..59c7018e 100644
--- a/lib/Common/Exceptions/AuthorizeException.php
+++ b/lib/Common/Exceptions/AuthorizeException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,5 +33,4 @@ namespace YooKassa\Common\Exceptions;
*/
class AuthorizeException extends ApiException
{
-
}
diff --git a/lib/Common/Exceptions/BadApiRequestException.php b/lib/Common/Exceptions/BadApiRequestException.php
index 85630ca9..f35fb441 100644
--- a/lib/Common/Exceptions/BadApiRequestException.php
+++ b/lib/Common/Exceptions/BadApiRequestException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/EmptyPropertyValueException.php b/lib/Common/Exceptions/EmptyPropertyValueException.php
index e42863f9..3494e5dd 100644
--- a/lib/Common/Exceptions/EmptyPropertyValueException.php
+++ b/lib/Common/Exceptions/EmptyPropertyValueException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/ExtensionNotFoundException.php b/lib/Common/Exceptions/ExtensionNotFoundException.php
index 3ae9a23a..ad5e0cda 100644
--- a/lib/Common/Exceptions/ExtensionNotFoundException.php
+++ b/lib/Common/Exceptions/ExtensionNotFoundException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/ForbiddenException.php b/lib/Common/Exceptions/ForbiddenException.php
index 96a9c4a3..9f33cbc2 100644
--- a/lib/Common/Exceptions/ForbiddenException.php
+++ b/lib/Common/Exceptions/ForbiddenException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/InternalServerError.php b/lib/Common/Exceptions/InternalServerError.php
index 17e62975..878e5835 100644
--- a/lib/Common/Exceptions/InternalServerError.php
+++ b/lib/Common/Exceptions/InternalServerError.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/InvalidPropertyException.php b/lib/Common/Exceptions/InvalidPropertyException.php
index 44e4be4c..c1c9a0dc 100644
--- a/lib/Common/Exceptions/InvalidPropertyException.php
+++ b/lib/Common/Exceptions/InvalidPropertyException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/InvalidPropertyValueException.php b/lib/Common/Exceptions/InvalidPropertyValueException.php
index 443fe6e5..d5a46405 100644
--- a/lib/Common/Exceptions/InvalidPropertyValueException.php
+++ b/lib/Common/Exceptions/InvalidPropertyValueException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/InvalidPropertyValueTypeException.php b/lib/Common/Exceptions/InvalidPropertyValueTypeException.php
index ad740b46..b1010f91 100644
--- a/lib/Common/Exceptions/InvalidPropertyValueTypeException.php
+++ b/lib/Common/Exceptions/InvalidPropertyValueTypeException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/InvalidRequestException.php b/lib/Common/Exceptions/InvalidRequestException.php
index f70747dd..f0e6d637 100644
--- a/lib/Common/Exceptions/InvalidRequestException.php
+++ b/lib/Common/Exceptions/InvalidRequestException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -44,7 +44,7 @@ class InvalidRequestException extends \RuntimeException
public function __construct($error, $code = 0, $previous = null)
{
if ($error instanceof AbstractRequest) {
- $message = 'Failed to build request "'.get_class($error).'": "'.$error->getLastValidationError().'"';
+ $message = 'Failed to build request "' . get_class($error) . '": "' . $error->getLastValidationError() . '"';
$this->errorRequest = $error;
} else {
$message = $error;
diff --git a/lib/Common/Exceptions/JsonException.php b/lib/Common/Exceptions/JsonException.php
index 840263dd..1a14ca67 100644
--- a/lib/Common/Exceptions/JsonException.php
+++ b/lib/Common/Exceptions/JsonException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/NotFoundException.php b/lib/Common/Exceptions/NotFoundException.php
index dac46c05..2d75608b 100644
--- a/lib/Common/Exceptions/NotFoundException.php
+++ b/lib/Common/Exceptions/NotFoundException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class NotFoundException extends ApiException
$message = '';
if (isset($errorData['description'])) {
- $message .= $errorData['description'].'. ';
+ $message .= $errorData['description'] . '. ';
}
if (isset($errorData['code'])) {
diff --git a/lib/Common/Exceptions/ResponseProcessingException.php b/lib/Common/Exceptions/ResponseProcessingException.php
index f5163a83..2f36c926 100644
--- a/lib/Common/Exceptions/ResponseProcessingException.php
+++ b/lib/Common/Exceptions/ResponseProcessingException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/TooManyRequestsException.php b/lib/Common/Exceptions/TooManyRequestsException.php
index 54eb3a5c..ae2e7714 100644
--- a/lib/Common/Exceptions/TooManyRequestsException.php
+++ b/lib/Common/Exceptions/TooManyRequestsException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/Exceptions/UnauthorizedException.php b/lib/Common/Exceptions/UnauthorizedException.php
index aeb86c52..94166ab0 100644
--- a/lib/Common/Exceptions/UnauthorizedException.php
+++ b/lib/Common/Exceptions/UnauthorizedException.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/HttpVerb.php b/lib/Common/HttpVerb.php
index 01a9b7a9..bd243816 100644
--- a/lib/Common/HttpVerb.php
+++ b/lib/Common/HttpVerb.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -28,12 +28,19 @@ namespace YooKassa\Common;
class HttpVerb extends AbstractEnum
{
+ /** Http метод GET */
const GET = 'GET';
+ /** Http метод POST */
const POST = 'POST';
+ /** Http метод PATCH */
const PATCH = 'PATCH';
+ /** Http метод HEAD */
const HEAD = 'HEAD';
+ /** Http метод OPTIONS */
const OPTIONS = 'OPTIONS';
+ /** Http метод PUT */
const PUT = 'PUT';
+ /** Http метод DELETE */
const DELETE = 'DELETE';
protected static $validValues = array(
diff --git a/lib/Common/LoggerWrapper.php b/lib/Common/LoggerWrapper.php
index 7d2defbf..09bfd773 100644
--- a/lib/Common/LoggerWrapper.php
+++ b/lib/Common/LoggerWrapper.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/ResponseObject.php b/lib/Common/ResponseObject.php
index c9590614..cbf0cfac 100644
--- a/lib/Common/ResponseObject.php
+++ b/lib/Common/ResponseObject.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Common/legacy_json_serializable.php b/lib/Common/legacy_json_serializable.php
index b9bdfd2f..32ccd75d 100644
--- a/lib/Common/legacy_json_serializable.php
+++ b/lib/Common/legacy_json_serializable.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,8 @@
*/
if (!interface_exists('JsonSerializable')) {
- interface JsonSerializable {
+ interface JsonSerializable
+ {
public function jsonSerialize();
}
}
diff --git a/lib/Helpers/Config/ConfigurationLoader.php b/lib/Helpers/Config/ConfigurationLoader.php
index ecd457e1..b5e280dc 100644
--- a/lib/Helpers/Config/ConfigurationLoader.php
+++ b/lib/Helpers/Config/ConfigurationLoader.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Helpers/Config/ConfigurationLoaderInterface.php b/lib/Helpers/Config/ConfigurationLoaderInterface.php
index 1a761fd1..7f891e9b 100644
--- a/lib/Helpers/Config/ConfigurationLoaderInterface.php
+++ b/lib/Helpers/Config/ConfigurationLoaderInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Helpers/ProductCode.php b/lib/Helpers/ProductCode.php
index 81bf13c4..4ea5ceae 100644
--- a/lib/Helpers/ProductCode.php
+++ b/lib/Helpers/ProductCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -136,7 +136,7 @@ class ProductCode
* @param string|null $codeDataMatrix Строка, расшифрованная из QR-кода
* @param bool|string $usePrefix Нужен ли код типа маркировки в результате
*/
- public function __construct($codeDataMatrix=null, $usePrefix=true)
+ public function __construct($codeDataMatrix = null, $usePrefix = true)
{
$this->preparePrefix($usePrefix);
@@ -618,7 +618,7 @@ class ProductCode
*/
private function numToHex($string)
{
- return str_pad($this->base_convert($string), 12, '0', STR_PAD_LEFT);
+ return str_pad($this->baseConvert($string), 12, '0', STR_PAD_LEFT);
}
/**
@@ -630,7 +630,7 @@ class ProductCode
* @param int $toBase
* @return string
*/
- private function base_convert($numString, $fromBase=10, $toBase=16)
+ private function baseConvert($numString, $fromBase = 10, $toBase = 16)
{
$chars = "0123456789abcdefghijklmnopqrstuvwxyz";
$toString = substr($chars, 0, $toBase);
@@ -702,5 +702,4 @@ class ProductCode
{
return $this->getResult();
}
-
}
diff --git a/lib/Helpers/Random.php b/lib/Helpers/Random.php
index bd96475b..96ca01f9 100644
--- a/lib/Helpers/Random.php
+++ b/lib/Helpers/Random.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -89,11 +89,11 @@ class Random
{
$result = '';
if ($maxLength !== null) {
- if (is_string($maxLength)) {
- $characters = $maxLength;
- } else {
- $length = self::int($length, $maxLength, $useBest);
- }
+ if (is_string($maxLength)) {
+ $characters = $maxLength;
+ } else {
+ $length = self::int($length, $maxLength, $useBest);
+ }
}
if ($characters === null) {
for ($i = 0; $i < $length; $i++) {
diff --git a/lib/Helpers/RawHeadersParser.php b/lib/Helpers/RawHeadersParser.php
index 67a8b78b..a3ce7fab 100644
--- a/lib/Helpers/RawHeadersParser.php
+++ b/lib/Helpers/RawHeadersParser.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Helpers/SecurityHelper.php b/lib/Helpers/SecurityHelper.php
index a650d4b0..5e6643d2 100644
--- a/lib/Helpers/SecurityHelper.php
+++ b/lib/Helpers/SecurityHelper.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -39,7 +39,7 @@ class SecurityHelper
public function isIPTrusted($ip)
{
if (!$this->isIPv6($ip)) {
- return $this->checkInIPv4TrustedList($ip);
+ return $this->checkInIPv4TrustedList($ip);
}
if (!$this->isIPv4($ip)) {
@@ -80,7 +80,7 @@ class SecurityHelper
*/
private function checkInIPv4TrustedList($ip)
{
- foreach($this->getIPv4TrustedList() as $range) {
+ foreach ($this->getIPv4TrustedList() as $range) {
if ($this->isIPInV4Range($ip, $range)) {
return true;
}
@@ -96,7 +96,7 @@ class SecurityHelper
*/
private function checkInIPv6TrustedList($ip)
{
- foreach($this->getIPv6TrustedList() as $range) {
+ foreach ($this->getIPv6TrustedList() as $range) {
if ($this->isIPInV6Range($ip, $range)) {
return true;
}
@@ -116,18 +116,18 @@ class SecurityHelper
$ip_dec = ip2long($ip);
if (strpos($range, '/') === false) {
- return ip2long($ip) == ip2long($range);
+ return ip2long($ip) === ip2long($range);
}
list($range, $netmask) = explode('/', $range, 2);
- list($a,$b,$c,$d) = explode('.', $range);
+ list($a, $b, $c, $d) = explode('.', $range);
$range = sprintf("%u.%u.%u.%u", $a, $b, $c, $d);
$range_dec = ip2long($range);
- $wildcard_dec = pow(2, (32-$netmask)) - 1;
- $netmask_dec = ~ $wildcard_dec;
+ $wildcard_dec = pow(2, (32 - (int)$netmask)) - 1;
+ $netmask_dec = ~$wildcard_dec;
- return (($ip_dec & $netmask_dec) == ($range_dec & $netmask_dec));
+ return (($ip_dec & $netmask_dec) === ($range_dec & $netmask_dec));
}
/**
@@ -169,7 +169,7 @@ class SecurityHelper
/**
* Возвращает список диапазонов IPv6 адресов с которых Юkassa может отправлять уведомления
*
- * @return \string[][]
+ * @return string[][]
*/
private function getIPv6TrustedList()
{
diff --git a/lib/Helpers/StringObject.php b/lib/Helpers/StringObject.php
index 3af103d5..a8fa70fb 100644
--- a/lib/Helpers/StringObject.php
+++ b/lib/Helpers/StringObject.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Helpers/TypeCast.php b/lib/Helpers/TypeCast.php
index 6501d184..ea527e13 100644
--- a/lib/Helpers/TypeCast.php
+++ b/lib/Helpers/TypeCast.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Helpers/UUID.php b/lib/Helpers/UUID.php
index cc304531..d3fe7ecc 100644
--- a/lib/Helpers/UUID.php
+++ b/lib/Helpers/UUID.php
@@ -1,7 +1,30 @@
_bookingReference = null;
} elseif (!TypeCast::canCastToString($value)) {
- throw new InvalidPropertyValueTypeException('Invalid booking reference value type', 0,
- 'airline.booking_reference');
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid booking reference value type',
+ 0,
+ 'airline.booking_reference'
+ );
} elseif (mb_strlen((string)$value, 'utf-8') > 20) {
- throw new InvalidPropertyValueException('Invalid booking reference value: "'.$value.'"', 0,
- 'airline.booking_reference');
+ throw new InvalidPropertyValueException(
+ 'Invalid booking reference value: "' . $value . '"',
+ 0,
+ 'airline.booking_reference'
+ );
} else {
$this->_bookingReference = (string)$value;
}
@@ -111,11 +116,17 @@ class Airline extends AbstractObject implements AirlineInterface
if ($value === null || $value === '') {
$this->_ticketNumber = null;
} elseif (!TypeCast::canCastToString($value)) {
- throw new InvalidPropertyValueTypeException('Invalid ticket number value type', 0,
- 'airline.ticket_number');
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid ticket number value type',
+ 0,
+ 'airline.ticket_number'
+ );
} elseif (!preg_match('/^[0-9]{1,150}$/', (string)$value)) {
- throw new InvalidPropertyValueException('Invalid ticket_number value: "'.$value.'"', 0,
- 'airline.ticket_number');
+ throw new InvalidPropertyValueException(
+ 'Invalid ticket_number value: "' . $value . '"',
+ 0,
+ 'airline.ticket_number'
+ );
} else {
$this->_ticketNumber = (string)$value;
}
@@ -140,7 +151,10 @@ class Airline extends AbstractObject implements AirlineInterface
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid passengers value type in airline', 0, 'airline.passengers', $value
+ 'Invalid passengers value type in airline',
+ 0,
+ 'airline.passengers',
+ $value
);
}
$this->_passengers = array();
@@ -149,7 +163,10 @@ class Airline extends AbstractObject implements AirlineInterface
$this->addPassenger($val);
} catch (InvalidPropertyValueTypeException $exception) {
throw new InvalidPropertyValueTypeException(
- 'Invalid passenger value type in airline', 0, 'airline.passengers['.$key.']', $val
+ 'Invalid passenger value type in airline',
+ 0,
+ 'airline.passengers[' . $key . ']',
+ $val
);
}
}
@@ -169,7 +186,8 @@ class Airline extends AbstractObject implements AirlineInterface
$this->_passengers[] = $passenger;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid passenger value type in airline', 0
+ 'Invalid passenger value type in airline',
+ 0
);
}
}
@@ -193,7 +211,10 @@ class Airline extends AbstractObject implements AirlineInterface
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid legs value type in airline', 0, 'airline.legs', $value
+ 'Invalid legs value type in airline',
+ 0,
+ 'airline.legs',
+ $value
);
}
$this->_legs = array();
@@ -202,7 +223,10 @@ class Airline extends AbstractObject implements AirlineInterface
$this->addLeg($val);
} catch (InvalidPropertyValueTypeException $exception) {
throw new InvalidPropertyValueTypeException(
- 'Invalid legs value type in airline', 0, 'airline.legs['.$key.']', $val
+ 'Invalid legs value type in airline',
+ 0,
+ 'airline.legs[' . $key . ']',
+ $val
);
}
}
@@ -222,7 +246,8 @@ class Airline extends AbstractObject implements AirlineInterface
$this->_legs[] = $leg;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid passenger value type in airline', 0
+ 'Invalid passenger value type in airline',
+ 0
);
}
}
diff --git a/lib/Model/AirlineInterface.php b/lib/Model/AirlineInterface.php
index cbe0460d..6b81e9d7 100644
--- a/lib/Model/AirlineInterface.php
+++ b/lib/Model/AirlineInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
interface AirlineInterface
{
/**
diff --git a/lib/Model/AmountInterface.php b/lib/Model/AmountInterface.php
index 8ea0e27d..70aab292 100644
--- a/lib/Model/AmountInterface.php
+++ b/lib/Model/AmountInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -65,4 +65,10 @@ interface AmountInterface
* @param string $value Код валюты
*/
public function setCurrency($value);
+
+ /**
+ * Возвращает ассоциативный массив со свойствами текущего объекта для его дальнейшей JSON сериализации
+ * @return array Ассоциативный массив со свойствами текущего объекта
+ */
+ public function toArray();
}
diff --git a/lib/Model/AuthorizationDetails.php b/lib/Model/AuthorizationDetails.php
index 455cc1bd..8f6a444d 100644
--- a/lib/Model/AuthorizationDetails.php
+++ b/lib/Model/AuthorizationDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@ use YooKassa\Helpers\TypeCast;
/**
* AuthorizationDetails - Данные об авторизации платежа
*
- * @property $rrn Retrieval Reference Number — уникальный идентификатор транзакции в системе эмитента
+ * @property string $rrn Retrieval Reference Number — уникальный идентификатор транзакции в системе эмитента
* @property string $authCode Код авторизации банковской карты
* @property ThreeDSecure $threeDSecure Данные о прохождении пользователем аутентификации по 3‑D Secure
*/
@@ -115,8 +115,12 @@ class AuthorizationDetails extends AbstractObject implements AuthorizationDetail
} elseif (TypeCast::canCastToEnumString($value)) {
$this->_rrn = (string)$value;
} else {
- throw new InvalidPropertyValueTypeException('Invalid rrn value type', 0,
- 'authorization_details.rrn', $value);
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid rrn value type',
+ 0,
+ 'authorization_details.rrn',
+ $value
+ );
}
}
@@ -134,8 +138,12 @@ class AuthorizationDetails extends AbstractObject implements AuthorizationDetail
} elseif (TypeCast::canCastToEnumString($value)) {
$this->_authCode = (string)$value;
} else {
- throw new InvalidPropertyValueTypeException('Invalid auth_code value type', 0,
- 'authorization_details.auth_code', $value);
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid auth_code value type',
+ 0,
+ 'authorization_details.auth_code',
+ $value
+ );
}
}
@@ -153,8 +161,12 @@ class AuthorizationDetails extends AbstractObject implements AuthorizationDetail
} elseif ($value instanceof ThreeDSecure) {
$this->_threeDSecure = $value;
} else {
- throw new InvalidPropertyValueTypeException('Invalid three_d_secure value type', 0,
- 'authorization_details.three_d_secure', $value);
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid three_d_secure value type',
+ 0,
+ 'authorization_details.three_d_secure',
+ $value
+ );
}
}
}
diff --git a/lib/Model/AuthorizationDetailsInterface.php b/lib/Model/AuthorizationDetailsInterface.php
index b3d43be3..da14424f 100644
--- a/lib/Model/AuthorizationDetailsInterface.php
+++ b/lib/Model/AuthorizationDetailsInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -41,17 +41,17 @@ interface AuthorizationDetailsInterface
* Возвращает Retrieval Reference Number — уникальный идентификатор транзакции в системе эмитента
* @return string|null Уникальный идентификатор транзакции
*/
- function getRrn();
+ public function getRrn();
/**
* Возвращает код авторизации банковской карты
* @return string|null Код авторизации банковской карты
*/
- function getAuthCode();
+ public function getAuthCode();
/**
* Возвращает данные о прохождении пользователем аутентификации по 3‑D Secure
* @return ThreeDSecure|null Объект с данными о прохождении пользователем аутентификации по 3‑D Secure
*/
- function getThreeDSecure();
+ public function getThreeDSecure();
}
diff --git a/lib/Model/BaseDeal.php b/lib/Model/BaseDeal.php
index ac57ff9c..74c58cb8 100644
--- a/lib/Model/BaseDeal.php
+++ b/lib/Model/BaseDeal.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -64,7 +64,10 @@ abstract class BaseDeal extends AbstractObject
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment type value type', 0, 'BaseDeal.type', $value
+ 'Invalid payment type value type',
+ 0,
+ 'BaseDeal.type',
+ $value
);
}
}
diff --git a/lib/Model/CancellationDetails.php b/lib/Model/CancellationDetails.php
index 90606df5..90514187 100644
--- a/lib/Model/CancellationDetails.php
+++ b/lib/Model/CancellationDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/CancellationDetailsInterface.php b/lib/Model/CancellationDetailsInterface.php
index e3b553b0..406c4fb8 100644
--- a/lib/Model/CancellationDetailsInterface.php
+++ b/lib/Model/CancellationDetailsInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -40,12 +40,11 @@ interface CancellationDetailsInterface
* Возвращает участника процесса платежа, который принял решение об отмене транзакции
* @return string Участник процесса платежа
*/
- function getParty();
+ public function getParty();
/**
* Возвращает причину отмены платежа
* @return string Причина отмены платежа
*/
- function getReason();
-
+ public function getReason();
}
diff --git a/lib/Model/CancellationDetailsPartyCode.php b/lib/Model/CancellationDetailsPartyCode.php
index 9e4a7ae3..20328235 100644
--- a/lib/Model/CancellationDetailsPartyCode.php
+++ b/lib/Model/CancellationDetailsPartyCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/CancellationDetailsReasonCode.php b/lib/Model/CancellationDetailsReasonCode.php
index c6cf1474..ac3f23a0 100644
--- a/lib/Model/CancellationDetailsReasonCode.php
+++ b/lib/Model/CancellationDetailsReasonCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Confirmation/AbstractConfirmation.php b/lib/Model/Confirmation/AbstractConfirmation.php
index 54eda75c..fe1c80a2 100644
--- a/lib/Model/Confirmation/AbstractConfirmation.php
+++ b/lib/Model/Confirmation/AbstractConfirmation.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -67,19 +67,27 @@ abstract class AbstractConfirmation extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "type" parameter in Confirmation', 0, 'confirmation.type'
+ 'Empty value for "type" parameter in Confirmation',
+ 0,
+ 'confirmation.type'
);
} elseif (TypeCast::canCastToEnumString($value)) {
if (ConfirmationType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Confirmation', 0, 'confirmation.type', $value
+ 'Invalid value for "type" parameter in Confirmation',
+ 0,
+ 'confirmation.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in Confirmation', 0, 'confirmation.type', $value
+ 'Invalid value type for "type" parameter in Confirmation',
+ 0,
+ 'confirmation.type',
+ $value
);
}
}
diff --git a/lib/Model/Confirmation/ConfirmationCodeVerification.php b/lib/Model/Confirmation/ConfirmationCodeVerification.php
index dde52fe9..afdab7d4 100644
--- a/lib/Model/Confirmation/ConfirmationCodeVerification.php
+++ b/lib/Model/Confirmation/ConfirmationCodeVerification.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Confirmation/ConfirmationEmbedded.php b/lib/Model/Confirmation/ConfirmationEmbedded.php
index bae89093..72e73686 100644
--- a/lib/Model/Confirmation/ConfirmationEmbedded.php
+++ b/lib/Model/Confirmation/ConfirmationEmbedded.php
@@ -1,8 +1,9 @@
confirmationToken = (string)$confirmationToken;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid confirmationToken value type', 0, 'confirmationEmbedded.confirmationToken', $confirmationToken
+ 'Invalid confirmationToken value type',
+ 0,
+ 'confirmationEmbedded.confirmationToken',
+ $confirmationToken
);
}
}
diff --git a/lib/Model/Confirmation/ConfirmationExternal.php b/lib/Model/Confirmation/ConfirmationExternal.php
index 20132b6d..1e552e8d 100644
--- a/lib/Model/Confirmation/ConfirmationExternal.php
+++ b/lib/Model/Confirmation/ConfirmationExternal.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Confirmation/ConfirmationFactory.php b/lib/Model/Confirmation/ConfirmationFactory.php
index 7c1850d5..775922d3 100644
--- a/lib/Model/Confirmation/ConfirmationFactory.php
+++ b/lib/Model/Confirmation/ConfirmationFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -57,9 +57,9 @@ class ConfirmationFactory
throw new \InvalidArgumentException('Invalid confirmation value in confirmation factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid confirmation value type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid confirmation value type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
diff --git a/lib/Model/Confirmation/ConfirmationMobileApplication.php b/lib/Model/Confirmation/ConfirmationMobileApplication.php
index 26a5c192..4afbceed 100644
--- a/lib/Model/Confirmation/ConfirmationMobileApplication.php
+++ b/lib/Model/Confirmation/ConfirmationMobileApplication.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,10 @@ class ConfirmationMobileApplication extends AbstractConfirmation
$this->_returnUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid returnUrl value type', 0, 'ConfirmationMobileApplication.returnUrl', $value
+ 'Invalid returnUrl value type',
+ 0,
+ 'ConfirmationMobileApplication.returnUrl',
+ $value
);
}
}
@@ -102,7 +105,10 @@ class ConfirmationMobileApplication extends AbstractConfirmation
$this->_confirmationUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid confirmationUrl value type', 0, 'ConfirmationMobileApplication.confirmationUrl', $value
+ 'Invalid confirmationUrl value type',
+ 0,
+ 'ConfirmationMobileApplication.confirmationUrl',
+ $value
);
}
}
diff --git a/lib/Model/Confirmation/ConfirmationQr.php b/lib/Model/Confirmation/ConfirmationQr.php
index d0c899c2..2a0913ed 100644
--- a/lib/Model/Confirmation/ConfirmationQr.php
+++ b/lib/Model/Confirmation/ConfirmationQr.php
@@ -1,8 +1,9 @@
_confirmationData = (string)$confirmationData;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid confirmationData value type', 0, 'confirmationQr.confirmationData', $confirmationData
+ 'Invalid confirmationData value type',
+ 0,
+ 'confirmationQr.confirmationData',
+ $confirmationData
);
}
}
diff --git a/lib/Model/Confirmation/ConfirmationRedirect.php b/lib/Model/Confirmation/ConfirmationRedirect.php
index 03e8d3d1..1c268943 100644
--- a/lib/Model/Confirmation/ConfirmationRedirect.php
+++ b/lib/Model/Confirmation/ConfirmationRedirect.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -85,7 +85,10 @@ class ConfirmationRedirect extends AbstractConfirmation
$this->_enforce = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid enforce value type', 0, 'confirmationRedirect.enforce', $value
+ 'Invalid enforce value type',
+ 0,
+ 'confirmationRedirect.enforce',
+ $value
);
}
}
@@ -110,7 +113,10 @@ class ConfirmationRedirect extends AbstractConfirmation
$this->_returnUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid returnUrl value type', 0, 'confirmationRedirect.returnUrl', $value
+ 'Invalid returnUrl value type',
+ 0,
+ 'confirmationRedirect.returnUrl',
+ $value
);
}
}
@@ -134,7 +140,10 @@ class ConfirmationRedirect extends AbstractConfirmation
$this->_confirmationUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid confirmationUrl value type', 0, 'confirmationRedirect.confirmationUrl', $value
+ 'Invalid confirmationUrl value type',
+ 0,
+ 'confirmationRedirect.confirmationUrl',
+ $value
);
}
}
diff --git a/lib/Model/ConfirmationAttributes/AbstractConfirmationAttributes.php b/lib/Model/ConfirmationAttributes/AbstractConfirmationAttributes.php
index 33e3ad62..7db2e46e 100644
--- a/lib/Model/ConfirmationAttributes/AbstractConfirmationAttributes.php
+++ b/lib/Model/ConfirmationAttributes/AbstractConfirmationAttributes.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -61,23 +61,32 @@ abstract class AbstractConfirmationAttributes extends AbstractObject
/**
* @param string $value
*/
- protected function _setType($value)
+ protected function setType($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "type" parameter in ConfirmationAttributes', 0, 'confirmationAttributes.type'
+ 'Empty value for "type" parameter in ConfirmationAttributes',
+ 0,
+ 'confirmationAttributes.type'
);
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (ConfirmationType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in ConfirmationAttributes', 0, 'confirmationAttributes.type', $value
+ 'Invalid value for "type" parameter in ConfirmationAttributes',
+ 0,
+ 'confirmationAttributes.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in ConfirmationAttributes', 0, 'confirmationAttributes.type', $value
+ 'Invalid value type for "type" parameter in ConfirmationAttributes',
+ 0,
+ 'confirmationAttributes.type',
+ $value
);
}
}
@@ -99,11 +108,17 @@ abstract class AbstractConfirmationAttributes extends AbstractObject
$this->_locale = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "locale" parameter in ConfirmationAttributes', 0, 'confirmationAttributes.locale', $value
+ 'Invalid value type for "locale" parameter in ConfirmationAttributes',
+ 0,
+ 'confirmationAttributes.locale',
+ $value
);
} elseif (!preg_match('/^[a-z]{2}_[A-Z]{2}$/', (string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid value type for "locale" parameter in ConfirmationAttributes', 0, 'confirmationAttributes.locale', $value
+ 'Invalid value type for "locale" parameter in ConfirmationAttributes',
+ 0,
+ 'confirmationAttributes.locale',
+ $value
);
} else {
$this->_locale = (string)$value;
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerification.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerification.php
index 3a61bfa8..c3248401 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerification.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesCodeVerification.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class ConfirmationAttributesCodeVerification extends AbstractConfirmationAttribu
{
public function __construct()
{
- $this->_setType(ConfirmationType::CODE_VERIFICATION);
+ $this->setType(ConfirmationType::CODE_VERIFICATION);
}
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesEmbedded.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesEmbedded.php
index f3eb16de..564f9987 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesEmbedded.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesEmbedded.php
@@ -1,8 +1,9 @@
_setType(ConfirmationType::EMBEDDED);
+ $this->setType(ConfirmationType::EMBEDDED);
}
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesExternal.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesExternal.php
index b6cda8dd..f76eb7f2 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesExternal.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesExternal.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,6 @@ class ConfirmationAttributesExternal extends AbstractConfirmationAttributes
{
public function __construct()
{
- $this->_setType(ConfirmationType::EXTERNAL);
+ $this->setType(ConfirmationType::EXTERNAL);
}
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesFactory.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesFactory.php
index 45b3dd36..d98d49dc 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesFactory.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -55,9 +55,9 @@ class ConfirmationAttributesFactory
throw new \InvalidArgumentException('Invalid confirmation attributes value in confirmation factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid confirmation attributes value type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid confirmation attributes value type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplication.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplication.php
index bb61d8b8..96cfa96d 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplication.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplication.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -44,7 +44,7 @@ class ConfirmationAttributesMobileApplication extends AbstractConfirmationAttrib
public function __construct($data = array())
{
parent::__construct($data);
- $this->_setType(ConfirmationType::MOBILE_APPLICATION);
+ $this->setType(ConfirmationType::MOBILE_APPLICATION);
}
/**
@@ -67,7 +67,10 @@ class ConfirmationAttributesMobileApplication extends AbstractConfirmationAttrib
$this->_returnUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid returnUrl value type', 0, 'ConfirmationAttributesMobileApplication.returnUrl', $value
+ 'Invalid returnUrl value type',
+ 0,
+ 'ConfirmationAttributesMobileApplication.returnUrl',
+ $value
);
}
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesQr.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesQr.php
index ada55835..c4e0d255 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesQr.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesQr.php
@@ -1,8 +1,9 @@
_setType(ConfirmationType::QR);
+ $this->setType(ConfirmationType::QR);
}
}
diff --git a/lib/Model/ConfirmationAttributes/ConfirmationAttributesRedirect.php b/lib/Model/ConfirmationAttributes/ConfirmationAttributesRedirect.php
index 68bbc7c3..d43c7e27 100644
--- a/lib/Model/ConfirmationAttributes/ConfirmationAttributesRedirect.php
+++ b/lib/Model/ConfirmationAttributes/ConfirmationAttributesRedirect.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +51,7 @@ class ConfirmationAttributesRedirect extends AbstractConfirmationAttributes
public function __construct()
{
- $this->_setType(ConfirmationType::REDIRECT);
+ $this->setType(ConfirmationType::REDIRECT);
}
/**
@@ -75,7 +75,10 @@ class ConfirmationAttributesRedirect extends AbstractConfirmationAttributes
$this->_enforce = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid enforce value type', 0, 'confirmationAttributesRedirect.enforce', $value
+ 'Invalid enforce value type',
+ 0,
+ 'confirmationAttributesRedirect.enforce',
+ $value
);
}
}
@@ -100,7 +103,10 @@ class ConfirmationAttributesRedirect extends AbstractConfirmationAttributes
$this->_returnUrl = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid returnUrl value type', 0, 'confirmationAttributesRedirect.returnUrl', $value
+ 'Invalid returnUrl value type',
+ 0,
+ 'confirmationAttributesRedirect.returnUrl',
+ $value
);
}
}
diff --git a/lib/Model/ConfirmationType.php b/lib/Model/ConfirmationType.php
index 63a92b99..60d89738 100644
--- a/lib/Model/ConfirmationType.php
+++ b/lib/Model/ConfirmationType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,22 +30,31 @@ use YooKassa\Common\AbstractEnum;
/**
* ConfirmationType - Тип пользовательского процесса подтверждения платежа
- * |Код|Описание|
- * --- | ---
- * |redirect|Необходимо направить плательщика на страницу партнера|
- * |external|Необходимо ождать пока плательщик самостоятельно подтвердит платеж|
- * |code_verification|Необходимо получить одноразовый код от плательщика для подтверждения платежа|
- * |embedded|Необходимо получить токен для checkout.js|
- * |qr|Необходимо получить QR-код|
- * |mobile_application|необходимо совершить действия в мобильном приложении|
+ *
+ * Возможные значения:
+ * - `redirect` - Необходимо направить плательщика на страницу партнера
+ * - `external` - Для подтверждения платежа пользователю необходимо совершить действия во внешней системе (например, ответить на смс)
+ * - `code_verification` - Необходимо получить одноразовый код от плательщика для подтверждения платежа
+ * - `embedded` - Необходимо получить токен для checkout.js
+ * - `qr` - Необходимо получить QR-код
+ * - `mobile_application` - Необходимо совершить действия в мобильном приложении
*/
class ConfirmationType extends AbstractEnum
{
- const REDIRECT = 'redirect';
- const EXTERNAL = 'external';
- const CODE_VERIFICATION = 'code_verification';
- const EMBEDDED = 'embedded';
- const QR = 'qr';
+ /** Необходимо направить плательщика на страницу партнера */
+ const REDIRECT = 'redirect';
+ /** Для подтверждения платежа пользователю необходимо совершить действия во внешней системе (например, ответить на смс) */
+ const EXTERNAL = 'external';
+ /**
+ * Необходимо ждать пока плательщик самостоятельно подтвердит платеж
+ * @deprecated Будет удален в будущих версиях
+ */
+ const CODE_VERIFICATION = 'code_verification';
+ /** Необходимо получить одноразовый код от плательщика для подтверждения платежа */
+ const EMBEDDED = 'embedded';
+ /** Необходимо получить QR-код */
+ const QR = 'qr';
+ /** Необходимо совершить действия в мобильном приложении */
const MOBILE_APPLICATION = 'mobile_application';
protected static $validValues = array(
diff --git a/lib/Model/CurrencyCode.php b/lib/Model/CurrencyCode.php
index 29f872f8..c0a525d6 100644
--- a/lib/Model/CurrencyCode.php
+++ b/lib/Model/CurrencyCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,12 @@ namespace YooKassa\Model;
use YooKassa\Common\AbstractEnum;
/**
- * CurrencyCode - Код валюты, ISO-4217 3-alpha currency symbol
+ * CurrencyCode - Код валюты в формате [ISO-4217](https://www.iso.org/iso-4217-currency-codes.html).
+ * Должен соответствовать валюте субаккаунта (`recipient.gateway_id`), если вы разделяете потоки платежей,
+ * и валюте аккаунта (shopId в [личном кабинете](https://yookassa.ru/my)), если не разделяете.
+ *
+ * @package YooKassa\Model
+ * @author cms@yoomoney.ru
*/
class CurrencyCode extends AbstractEnum
{
@@ -47,6 +52,16 @@ class CurrencyCode extends AbstractEnum
const KZT = 'KZT';
/** Украинская гривна */
const UAH = 'UAH';
+ /** Узбекский сум */
+ const UZS = 'UZS';
+ /** Турецкая лира */
+ const _TRY = 'TRY';
+ /** Индийская рупия */
+ const INR = 'INR';
+ /** Молдавский лей */
+ const MDL = 'MDL';
+ /** Азербайджанский манат */
+ const AZN = 'AZN';
protected static $validValues = array(
self::RUB => true,
@@ -56,5 +71,10 @@ class CurrencyCode extends AbstractEnum
self::CNY => true,
self::KZT => true,
self::UAH => true,
+ self::UZS => true,
+ self::_TRY => true,
+ self::INR => true,
+ self::MDL => true,
+ self::AZN => true,
);
}
diff --git a/lib/Model/Deal/CaptureDealData.php b/lib/Model/Deal/CaptureDealData.php
index bbac0bc0..6d4116d9 100644
--- a/lib/Model/Deal/CaptureDealData.php
+++ b/lib/Model/Deal/CaptureDealData.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -65,7 +65,10 @@ class CaptureDealData extends AbstractObject
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements', $value
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements',
+ $value
);
}
$this->_settlements = array();
@@ -76,7 +79,10 @@ class CaptureDealData extends AbstractObject
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements['.$key.']', $val
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements[' . $key . ']',
+ $val
);
}
}
diff --git a/lib/Model/Deal/DealBalanceAmount.php b/lib/Model/Deal/DealBalanceAmount.php
index 19aeda9b..1d4e7c1b 100644
--- a/lib/Model/Deal/DealBalanceAmount.php
+++ b/lib/Model/Deal/DealBalanceAmount.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -147,7 +147,10 @@ class DealBalanceAmount extends AbstractObject implements AmountInterface
$this->_currency = $value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid currency value: "' . $value . '"', 0, 'amount.currency', $value
+ 'Invalid currency value: "' . $value . '"',
+ 0,
+ 'amount.currency',
+ $value
);
}
} else {
diff --git a/lib/Model/Deal/DealStatus.php b/lib/Model/Deal/DealStatus.php
index 02f5dd32..21149621 100644
--- a/lib/Model/Deal/DealStatus.php
+++ b/lib/Model/Deal/DealStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Deal/DealType.php b/lib/Model/Deal/DealType.php
index cbad6bc7..2b39b693 100644
--- a/lib/Model/Deal/DealType.php
+++ b/lib/Model/Deal/DealType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Deal/FeeMoment.php b/lib/Model/Deal/FeeMoment.php
index f9402691..5ef8e818 100644
--- a/lib/Model/Deal/FeeMoment.php
+++ b/lib/Model/Deal/FeeMoment.php
@@ -1,5 +1,29 @@
true,
self::DEAL_CLOSED => true,
);
-}
\ No newline at end of file
+}
diff --git a/lib/Model/Deal/PaymentDealInfo.php b/lib/Model/Deal/PaymentDealInfo.php
index 6c84e445..42a1a666 100644
--- a/lib/Model/Deal/PaymentDealInfo.php
+++ b/lib/Model/Deal/PaymentDealInfo.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -89,7 +89,10 @@ class PaymentDealInfo extends AbstractObject
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements', $value
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements',
+ $value
);
}
$this->_settlements = array();
@@ -100,7 +103,10 @@ class PaymentDealInfo extends AbstractObject
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements['.$key.']', $val
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements[' . $key . ']',
+ $val
);
}
}
diff --git a/lib/Model/Deal/PayoutDealInfo.php b/lib/Model/Deal/PayoutDealInfo.php
index 523f5701..6039f5a3 100644
--- a/lib/Model/Deal/PayoutDealInfo.php
+++ b/lib/Model/Deal/PayoutDealInfo.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Deal/RefundDealData.php b/lib/Model/Deal/RefundDealData.php
index 1b69f0dc..aec2ea21 100644
--- a/lib/Model/Deal/RefundDealData.php
+++ b/lib/Model/Deal/RefundDealData.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,6 @@ use YooKassa\Model\SettlementInterface;
*/
class RefundDealData extends AbstractObject
{
-
/** @var SettlementPayoutRefund[] Данные о распределении денег */
private $_refund_settlements = array();
@@ -68,7 +67,10 @@ class RefundDealData extends AbstractObject
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid refund_settlements value type in deal', 0, 'deal.refund_settlements', $value
+ 'Invalid refund_settlements value type in deal',
+ 0,
+ 'deal.refund_settlements',
+ $value
);
}
$this->_refund_settlements = array();
@@ -79,7 +81,10 @@ class RefundDealData extends AbstractObject
$this->addRefundSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid refund_settlements value type in deal', 0, 'deal.refund_settlements['.$key.']', $val
+ 'Invalid refund_settlements value type in deal',
+ 0,
+ 'deal.refund_settlements[' . $key . ']',
+ $val
);
}
}
diff --git a/lib/Model/Deal/RefundDealInfo.php b/lib/Model/Deal/RefundDealInfo.php
index 6ae416ed..2f7d7bb8 100644
--- a/lib/Model/Deal/RefundDealInfo.php
+++ b/lib/Model/Deal/RefundDealInfo.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -91,7 +91,10 @@ class RefundDealInfo extends AbstractObject
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements', $value
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements',
+ $value
);
}
$this->_refund_settlements = array();
@@ -102,7 +105,10 @@ class RefundDealInfo extends AbstractObject
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in deal', 0, 'deal.settlements['.$key.']', $val
+ 'Invalid settlements value type in deal',
+ 0,
+ 'deal.settlements[' . $key . ']',
+ $val
);
}
}
diff --git a/lib/Model/Deal/SettlementPayoutPayment.php b/lib/Model/Deal/SettlementPayoutPayment.php
index d6881c5c..056a0f5a 100644
--- a/lib/Model/Deal/SettlementPayoutPayment.php
+++ b/lib/Model/Deal/SettlementPayoutPayment.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model\Deal;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Common\Exceptions\EmptyPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
@@ -72,19 +71,27 @@ class SettlementPayoutPayment extends AbstractObject implements SettlementInterf
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "type" parameter in Settlement', 0, 'settlement.type'
+ 'Empty value for "type" parameter in Settlement',
+ 0,
+ 'settlement.type'
);
} elseif (TypeCast::canCastToEnumString($value)) {
if (SettlementPayoutPaymentType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value type for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
}
@@ -106,7 +113,9 @@ class SettlementPayoutPayment extends AbstractObject implements SettlementInterf
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "amount" parameter in Settlement', 0, 'settlement.amount'
+ 'Empty value for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount'
);
} elseif (is_array($value)) {
$this->_amount = $this->factoryAmount($value);
@@ -114,7 +123,10 @@ class SettlementPayoutPayment extends AbstractObject implements SettlementInterf
$this->_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "amount" parameter in Settlement', 0, 'settlement.amount', $value
+ 'Invalid value type for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount',
+ $value
);
}
}
diff --git a/lib/Model/Deal/SettlementPayoutPaymentType.php b/lib/Model/Deal/SettlementPayoutPaymentType.php
index 00f20ed2..5d790dc8 100644
--- a/lib/Model/Deal/SettlementPayoutPaymentType.php
+++ b/lib/Model/Deal/SettlementPayoutPaymentType.php
@@ -1,8 +1,9 @@
_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value type for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
}
@@ -107,7 +114,9 @@ class SettlementPayoutRefund extends AbstractObject implements SettlementInterfa
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "amount" parameter in Settlement', 0, 'settlement.amount'
+ 'Empty value for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount'
);
} elseif (is_array($value)) {
$this->_amount = $this->factoryAmount($value);
@@ -115,7 +124,10 @@ class SettlementPayoutRefund extends AbstractObject implements SettlementInterfa
$this->_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "amount" parameter in Settlement', 0, 'settlement.amount', $value
+ 'Invalid value type for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount',
+ $value
);
}
}
diff --git a/lib/Model/DealInterface.php b/lib/Model/DealInterface.php
index f40910dd..522f9306 100644
--- a/lib/Model/DealInterface.php
+++ b/lib/Model/DealInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/FraudData.php b/lib/Model/FraudData.php
new file mode 100644
index 00000000..2af81ebb
--- /dev/null
+++ b/lib/Model/FraudData.php
@@ -0,0 +1,98 @@
+_topped_up_phone;
+ }
+
+ /**
+ * Устанавливает номер телефона для пополнения.
+ *
+ * @param string|null $topped_up_phone Номер телефона для пополнения
+ *
+ * @return FraudData
+ */
+ public function setToppedUpPhone($topped_up_phone = null)
+ {
+ if ($topped_up_phone === null || $topped_up_phone === '') {
+ $this->_topped_up_phone = null;
+ } elseif (TypeCast::canCastToString($topped_up_phone)) {
+ $value = preg_replace('/\D/', '', $topped_up_phone);
+ if (mb_strlen($value, 'utf-8') > 15) {
+ throw new InvalidPropertyValueException(
+ 'Invalid FraudData topped_up_phone value',
+ 0,
+ 'FraudData.topped_up_phone',
+ $value
+ );
+ }
+ $this->_topped_up_phone = (string)$value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid topped_up_phone topped_up_phone type in FraudData',
+ 0,
+ 'FraudData.topped_up_phone',
+ $topped_up_phone
+ );
+ }
+
+ return $this;
+ }
+}
diff --git a/lib/Model/Leg.php b/lib/Model/Leg.php
index 824e0230..1760b376 100644
--- a/lib/Model/Leg.php
+++ b/lib/Model/Leg.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueTypeException;
@@ -81,11 +80,17 @@ class Leg extends AbstractObject implements LegInterface
public function setDepartureAirport($value)
{
if (!TypeCast::canCastToString($value)) {
- throw new InvalidPropertyValueTypeException('Invalid departure_airport value type', 0,
- 'airline.departure_airport');
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid departure_airport value type',
+ 0,
+ 'airline.departure_airport'
+ );
} elseif (!preg_match('/^[A-Z]{3}$/', (string)$value)) {
- throw new InvalidPropertyValueException('Invalid departure_airport value: "'.$value.'"', 0,
- 'airline.departure_airport');
+ throw new InvalidPropertyValueException(
+ 'Invalid departure_airport value: "' . $value . '"',
+ 0,
+ 'airline.departure_airport'
+ );
} else {
$this->_departureAirport = (string)$value;
}
@@ -106,11 +111,17 @@ class Leg extends AbstractObject implements LegInterface
public function setDestinationAirport($value)
{
if (!TypeCast::canCastToString($value)) {
- throw new InvalidPropertyValueTypeException('Invalid destination_airport value type', 0,
- 'airline.destination_airport');
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid destination_airport value type',
+ 0,
+ 'airline.destination_airport'
+ );
} elseif (!preg_match('/^[A-Z]{3}$/', (string)$value)) {
- throw new InvalidPropertyValueException('Invalid destination_airport value: "'.$value.'"', 0,
- 'airline.destination_airport');
+ throw new InvalidPropertyValueException(
+ 'Invalid destination_airport value: "' . $value . '"',
+ 0,
+ 'airline.destination_airport'
+ );
} else {
$this->_destinationAirport = (string)$value;
}
@@ -135,13 +146,17 @@ class Leg extends AbstractObject implements LegInterface
$departureDate = TypeCast::castToDateTime($value);
if ($departureDate === null) {
throw new InvalidPropertyValueException(
- 'Invalid departure_date value in airline.legs', 0, 'airline.legs'
+ 'Invalid departure_date value in airline.legs',
+ 0,
+ 'airline.legs'
);
}
$this->_departureDate = $departureDate->format(self::ISO8601);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid departure_date value type in airline.legs', 0, 'airline.legs'
+ 'Invalid departure_date value type in airline.legs',
+ 0,
+ 'airline.legs'
);
}
}
diff --git a/lib/Model/LegInterface.php b/lib/Model/LegInterface.php
index 3e65f3b3..f48c6af7 100644
--- a/lib/Model/LegInterface.php
+++ b/lib/Model/LegInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Locale.php b/lib/Model/Locale.php
index 18879f00..4c7ae81e 100644
--- a/lib/Model/Locale.php
+++ b/lib/Model/Locale.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,14 +30,16 @@ use YooKassa\Common\AbstractEnum;
/**
* Locale - Язык интерфейса, писем и смс, которые будет видеть или получать пользователь
- * |Код|Описание|
- * --- | ---
- * |ru_RU|Русский|
- * |en_US|English|
+ *
+ * Возможные значения:
+ * - `ru_RU` - Русский
+ * - `en_US` - English
*/
class Locale extends AbstractEnum
{
+ /** Русский */
const RUSSIAN = 'ru_RU';
+ /** English */
const ENGLISH = 'en_US';
protected static $validValues = array(
diff --git a/lib/Model/Metadata.php b/lib/Model/Metadata.php
index d30261a4..d165b521 100644
--- a/lib/Model/Metadata.php
+++ b/lib/Model/Metadata.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/MonetaryAmount.php b/lib/Model/MonetaryAmount.php
index 822f6977..c9c87c95 100644
--- a/lib/Model/MonetaryAmount.php
+++ b/lib/Model/MonetaryAmount.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -103,11 +103,11 @@ class MonetaryAmount extends AbstractObject implements AmountInterface
throw new InvalidPropertyValueTypeException('Invalid amount value type', 0, 'amount.value', $value);
}
if ($value <= 0.0) {
- throw new InvalidPropertyValueException('Invalid amount value: "'.$value.'"', 0, 'amount.value', $value);
+ throw new InvalidPropertyValueException('Invalid amount value: "' . $value . '"', 0, 'amount.value', $value);
}
$castedValue = (int)round($value * 100.0);
if ($castedValue <= 0.0) {
- throw new InvalidPropertyValueException('Invalid amount value: "'.$value.'"', 0, 'amount.value', $value);
+ throw new InvalidPropertyValueException('Invalid amount value: "' . $value . '"', 0, 'amount.value', $value);
}
$this->_value = $castedValue;
}
@@ -149,7 +149,10 @@ class MonetaryAmount extends AbstractObject implements AmountInterface
$this->_currency = $value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid currency value: "' . $value . '"', 0, 'amount.currency', $value
+ 'Invalid currency value: "' . $value . '"',
+ 0,
+ 'amount.currency',
+ $value
);
}
} else {
@@ -173,18 +176,27 @@ class MonetaryAmount extends AbstractObject implements AmountInterface
}
if (!is_numeric($coefficient)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid coefficient type in multiply method', 0, 'amount.value', $coefficient
+ 'Invalid coefficient type in multiply method',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
if ($coefficient <= 0.0) {
throw new InvalidPropertyValueException(
- 'Invalid coefficient in multiply method: "' . $coefficient . '"', 0, 'amount.value', $coefficient
+ 'Invalid coefficient in multiply method: "' . $coefficient . '"',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
$castedValue = (int)round($coefficient * $this->_value);
if ($castedValue === 0) {
throw new InvalidPropertyValueException(
- 'Invalid coefficient value in multiply method: "' . $coefficient . '"', 0, 'amount.value', $coefficient
+ 'Invalid coefficient value in multiply method: "' . $coefficient . '"',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
$this->_value = $castedValue;
@@ -205,13 +217,19 @@ class MonetaryAmount extends AbstractObject implements AmountInterface
}
if (!is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid amount value type in increase method', 0, 'amount.value', $value
+ 'Invalid amount value type in increase method',
+ 0,
+ 'amount.value',
+ $value
);
}
$castedValue = (int)round($this->_value + $value * 100.0);
if ($castedValue <= 0) {
throw new InvalidPropertyValueException(
- 'Invalid amount value in increase method: "' . $value . '"', 0, 'amount.value', $value
+ 'Invalid amount value in increase method: "' . $value . '"',
+ 0,
+ 'amount.value',
+ $value
);
}
$this->_value = $castedValue;
diff --git a/lib/Model/Notification/AbstractNotification.php b/lib/Model/Notification/AbstractNotification.php
index d7297b99..6ee256e5 100644
--- a/lib/Model/Notification/AbstractNotification.php
+++ b/lib/Model/Notification/AbstractNotification.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -80,21 +80,28 @@ abstract class AbstractNotification extends AbstractObject implements Notificati
* нотификаций
* @throws InvalidPropertyValueTypeException Выбрасывается если переданное значение не является строкой
*/
- protected function _setType($value)
+ protected function setType($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException('Empty parameter "type" in Notification', 0, 'notification.type');
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (NotificationType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $value
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in Notification', 0, 'notification.type', $value
+ 'Invalid value type for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $value
);
}
}
@@ -121,21 +128,28 @@ abstract class AbstractNotification extends AbstractObject implements Notificati
* событий
* @throws InvalidPropertyValueTypeException Выбрасывается если переданное значение не является строкой
*/
- protected function _setEvent($value)
+ protected function setEvent($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException('Empty parameter "event" in Notification', 0, 'notification.event');
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (NotificationEventType::valueExists($value)) {
$this->_event = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $value
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "event" parameter in Notification', 0, 'notification.event', $value
+ 'Invalid value type for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $value
);
}
}
diff --git a/lib/Model/Notification/NotificationCanceled.php b/lib/Model/Notification/NotificationCanceled.php
index b6a958a1..a0a1fbee 100644
--- a/lib/Model/Notification/NotificationCanceled.php
+++ b/lib/Model/Notification/NotificationCanceled.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model\Notification;
-
use YooKassa\Common\Exceptions\EmptyPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
use YooKassa\Model\NotificationEventType;
@@ -62,34 +61,40 @@ class NotificationCanceled extends AbstractNotification
* тела пришедшего запроса. При конструировании проверяется валидность типа передаваемого уведомления, если
* передать уведомление не того типа, будет сгенерировано исключение типа {@link InvalidPropertyValueException}
*
- * @param array $source Ассоциативный массив с информацией об уведомлении
+ * @param array $sourceArray Ассоциативный массив с информацией об уведомлении
*
* @throws InvalidPropertyValueException Генерируется если значение типа нотификации или события не равны
* "notification" и "payment.canceled" соответственно, что может говорить о том, что переданные в
* конструктор данные не являются уведомлением нужного типа.
*/
- public function fromArray($source)
+ public function fromArray($sourceArray)
{
- $this->_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::PAYMENT_CANCELED);
- if (!empty($source['type'])) {
- if ($this->getType() !== $source['type']) {
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::PAYMENT_CANCELED);
+ if (!empty($sourceArray['type'])) {
+ if ($this->getType() !== $sourceArray['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $sourceArray['type']
);
}
}
- if (!empty($source['event'])) {
- if ($this->getEvent() !== $source['event']) {
+ if (!empty($sourceArray['event'])) {
+ if ($this->getEvent() !== $sourceArray['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $sourceArray['event']
);
}
}
- if (empty($source['object'])) {
+ if (empty($sourceArray['object'])) {
throw new EmptyPropertyValueException('Parameter object in NotificationCanceled is empty');
}
- $this->_object = new PaymentResponse($source['object']);
+ $this->_object = new PaymentResponse($sourceArray['object']);
}
/**
diff --git a/lib/Model/Notification/NotificationDealClosed.php b/lib/Model/Notification/NotificationDealClosed.php
index f0c91b4b..ba6bc39d 100644
--- a/lib/Model/Notification/NotificationDealClosed.php
+++ b/lib/Model/Notification/NotificationDealClosed.php
@@ -1,8 +1,9 @@
_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::DEAL_CLOSED);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::DEAL_CLOSED);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/Notification/NotificationFactory.php b/lib/Model/Notification/NotificationFactory.php
index c0276385..3768bae2 100644
--- a/lib/Model/Notification/NotificationFactory.php
+++ b/lib/Model/Notification/NotificationFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -70,5 +70,4 @@ class NotificationFactory
return new $className($data);
}
-
}
diff --git a/lib/Model/Notification/NotificationInterface.php b/lib/Model/Notification/NotificationInterface.php
index ebf80ae0..ef373e4b 100644
--- a/lib/Model/Notification/NotificationInterface.php
+++ b/lib/Model/Notification/NotificationInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model\Notification;
-
use YooKassa\Model\PaymentInterface;
use YooKassa\Model\RefundInterface;
@@ -39,7 +38,7 @@ interface NotificationInterface
*
* @return string Тип уведомления в виде строки
*/
- function getType();
+ public function getType();
/**
* Возвращает тип события
@@ -48,7 +47,7 @@ interface NotificationInterface
*
* @return string Тип события
*/
- function getEvent();
+ public function getEvent();
/**
* Возвращает объект с информацией о платеже или возврате, уведомление о котором хранится в текущем объекте
@@ -59,5 +58,5 @@ interface NotificationInterface
*
* @return PaymentInterface|RefundInterface Объект с информацией о платеже
*/
- function getObject();
+ public function getObject();
}
diff --git a/lib/Model/Notification/NotificationPayoutCanceled.php b/lib/Model/Notification/NotificationPayoutCanceled.php
index bf3c85cb..e22b3168 100644
--- a/lib/Model/Notification/NotificationPayoutCanceled.php
+++ b/lib/Model/Notification/NotificationPayoutCanceled.php
@@ -1,8 +1,9 @@
_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::PAYOUT_CANCELED);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::PAYOUT_CANCELED);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/Notification/NotificationPayoutSucceeded.php b/lib/Model/Notification/NotificationPayoutSucceeded.php
index b359cb2f..7c763eb3 100644
--- a/lib/Model/Notification/NotificationPayoutSucceeded.php
+++ b/lib/Model/Notification/NotificationPayoutSucceeded.php
@@ -1,8 +1,9 @@
_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::PAYOUT_SUCCEEDED);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::PAYOUT_SUCCEEDED);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/Notification/NotificationRefundSucceeded.php b/lib/Model/Notification/NotificationRefundSucceeded.php
index f77976bd..1641ece4 100644
--- a/lib/Model/Notification/NotificationRefundSucceeded.php
+++ b/lib/Model/Notification/NotificationRefundSucceeded.php
@@ -1,8 +1,9 @@
_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::REFUND_SUCCEEDED);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::REFUND_SUCCEEDED);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/Notification/NotificationSucceeded.php b/lib/Model/Notification/NotificationSucceeded.php
index 7acf3943..73280305 100644
--- a/lib/Model/Notification/NotificationSucceeded.php
+++ b/lib/Model/Notification/NotificationSucceeded.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -69,19 +69,25 @@ class NotificationSucceeded extends AbstractNotification
*/
public function __construct(array $source)
{
- $this->_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::PAYMENT_SUCCEEDED);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::PAYMENT_SUCCEEDED);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/Notification/NotificationWaitingForCapture.php b/lib/Model/Notification/NotificationWaitingForCapture.php
index bf216734..db6c98af 100644
--- a/lib/Model/Notification/NotificationWaitingForCapture.php
+++ b/lib/Model/Notification/NotificationWaitingForCapture.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -73,19 +73,25 @@ class NotificationWaitingForCapture extends AbstractNotification
*/
public function __construct(array $source)
{
- $this->_setType(NotificationType::NOTIFICATION);
- $this->_setEvent(NotificationEventType::PAYMENT_WAITING_FOR_CAPTURE);
+ $this->setType(NotificationType::NOTIFICATION);
+ $this->setEvent(NotificationEventType::PAYMENT_WAITING_FOR_CAPTURE);
if (!empty($source['type'])) {
if ($this->getType() !== $source['type']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Notification', 0, 'notification.type', $source['type']
+ 'Invalid value for "type" parameter in Notification',
+ 0,
+ 'notification.type',
+ $source['type']
);
}
}
if (!empty($source['event'])) {
if ($this->getEvent() !== $source['event']) {
throw new InvalidPropertyValueException(
- 'Invalid value for "event" parameter in Notification', 0, 'notification.event', $source['event']
+ 'Invalid value for "event" parameter in Notification',
+ 0,
+ 'notification.event',
+ $source['event']
);
}
}
diff --git a/lib/Model/NotificationEventType.php b/lib/Model/NotificationEventType.php
index ce44eba2..0ab85fa6 100644
--- a/lib/Model/NotificationEventType.php
+++ b/lib/Model/NotificationEventType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,15 +30,15 @@ use YooKassa\Common\AbstractEnum;
/**
* NotificationEventType - Тип уведомления
- * |Код|Описание|
- * --- | ---
- * |payment.waiting_for_capture|Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)|
- * |payment.succeeded|Успешно оплачен и подтвержден магазином|
- * |payment.canceled|Неуспех оплаты или отменен магазином|
- * |refund.succeeded|Успешный возврат|
- * |deal.closed|Сделка перешла в статус closed|
- * |payout.canceled|Выплата перешла в статус canceled|
- * |payout.succeeded|Выплата перешла в статус succeeded|
+ *
+ * Возможные значения:
+ * - `payment.waiting_for_capture` - Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)
+ * - `payment.succeeded` - Успешно оплачен и подтвержден магазином
+ * - `payment.canceled` - Неуспех оплаты или отменен магазином
+ * - `refund.succeeded` - Успешный возврат
+ * - `deal.closed` - Сделка перешла в статус closed
+ * - `payout.canceled` - Выплата перешла в статус canceled
+ * - `payout.succeeded` - Выплата перешла в статус succeeded
*
* @package YooKassa
*/
diff --git a/lib/Model/NotificationType.php b/lib/Model/NotificationType.php
index 287415fe..21947ec0 100644
--- a/lib/Model/NotificationType.php
+++ b/lib/Model/NotificationType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Passenger.php b/lib/Model/Passenger.php
index d0291d12..7c2830e9 100644
--- a/lib/Model/Passenger.php
+++ b/lib/Model/Passenger.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueTypeException;
@@ -70,20 +69,28 @@ class Passenger extends AbstractObject implements PassengerInterface
{
if (empty($value) || is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid first_name value type in Passenger object', 0, 'airline.passengers', $value
+ 'Invalid first_name value type in Passenger object',
+ 0,
+ 'airline.passengers',
+ $value
);
- } else if (TypeCast::canCastToString($value)) {
+ } elseif (TypeCast::canCastToString($value)) {
$length = mb_strlen((string)$value, 'utf-8');
if ($length > 64) {
throw new InvalidPropertyValueException(
'Invalid first_name value length in Passenger object',
- 0, 'airline.passengers', $value
+ 0,
+ 'airline.passengers',
+ $value
);
}
$this->_firstName = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid first_name value type in Passenger object', 0, 'airline.passengers', $value
+ 'Invalid first_name value type in Passenger object',
+ 0,
+ 'airline.passengers',
+ $value
);
}
}
@@ -104,20 +111,28 @@ class Passenger extends AbstractObject implements PassengerInterface
{
if (empty($value) || is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid last_name value type in Passenger object', 0, 'airline.passengers', $value
+ 'Invalid last_name value type in Passenger object',
+ 0,
+ 'airline.passengers',
+ $value
);
- } else if (TypeCast::canCastToString($value)) {
+ } elseif (TypeCast::canCastToString($value)) {
$length = mb_strlen((string)$value, 'utf-8');
if ($length > 64) {
throw new InvalidPropertyValueException(
'Invalid last_name value length in Passenger object',
- 0, 'airline.passengers', $value
+ 0,
+ 'airline.passengers',
+ $value
);
}
$this->_lastName = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid last_name value type in Passenger object', 0, 'airline.passengers', $value
+ 'Invalid last_name value type in Passenger object',
+ 0,
+ 'airline.passengers',
+ $value
);
}
}
diff --git a/lib/Model/PassengerInterface.php b/lib/Model/PassengerInterface.php
index a20588f6..0e14a6dd 100644
--- a/lib/Model/PassengerInterface.php
+++ b/lib/Model/PassengerInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
interface PassengerInterface
{
/**
diff --git a/lib/Model/Payment.php b/lib/Model/Payment.php
index 15d876e0..a55d46b4 100644
--- a/lib/Model/Payment.php
+++ b/lib/Model/Payment.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -254,7 +254,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_status = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment status value type', 0, 'Payment.status', $value
+ 'Invalid payment status value type',
+ 0,
+ 'Payment.status',
+ $value
);
}
}
@@ -328,7 +331,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'CreatePaymentRequest.description', $value
+ 'Invalid description value type',
+ 0,
+ 'CreatePaymentRequest.description',
+ $value
);
}
}
@@ -476,7 +482,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_paid = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment paid flag value type', 0, 'Payment.paid', $value
+ 'Invalid payment paid flag value type',
+ 0,
+ 'Payment.paid',
+ $value
);
}
}
@@ -505,7 +514,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_refundable = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment refundable flag value type', 0, 'Payment.refundable', $value
+ 'Invalid payment refundable flag value type',
+ 0,
+ 'Payment.refundable',
+ $value
);
}
}
@@ -535,12 +547,18 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_receiptRegistration = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid receipt_registration value', 0, 'payment.receiptRegistration', $value
+ 'Invalid receipt_registration value',
+ 0,
+ 'payment.receiptRegistration',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid receipt_registration value type', 0, 'payment.receiptRegistration', $value
+ 'Invalid receipt_registration value type',
+ 0,
+ 'payment.receiptRegistration',
+ $value
);
}
}
@@ -690,7 +708,8 @@ class Payment extends AbstractObject implements PaymentInterface
* @param RequestorInterface|array $value
*/
public function setRequestor($value)
- {}
+ {
+ }
/**
* Возвращает инициатора платежа
@@ -723,7 +742,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_test = (bool)$test;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment test flag value type', 0, 'Payment.test', $test
+ 'Invalid payment test flag value type',
+ 0,
+ 'Payment.test',
+ $test
);
}
}
@@ -753,7 +775,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_deal = new PaymentDealInfo($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal value type in Payment', 0, 'Payment.deal', $value
+ 'Invalid deal value type in Payment',
+ 0,
+ 'Payment.deal',
+ $value
);
}
}
@@ -790,7 +815,10 @@ class Payment extends AbstractObject implements PaymentInterface
$this->_merchant_customer_id = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid merchant_customer_id value type in Payment', 0, 'Payment.merchant_customer_id', $value
+ 'Invalid merchant_customer_id value type in Payment',
+ 0,
+ 'Payment.merchant_customer_id',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/AbstractPaymentData.php b/lib/Model/PaymentData/AbstractPaymentData.php
index f94edc7c..e326eb76 100644
--- a/lib/Model/PaymentData/AbstractPaymentData.php
+++ b/lib/Model/PaymentData/AbstractPaymentData.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -57,23 +57,32 @@ abstract class AbstractPaymentData extends AbstractObject
* Устанавливает тип метода оплаты
* @param string $value Тип метода оплаты
*/
- protected function _setType($value)
+ protected function setType($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty payment data type', 0, 'paymentData.type'
+ 'Empty payment data type',
+ 0,
+ 'paymentData.type'
);
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (PaymentMethodType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in PaymentData', 0, 'paymentData.type', $value
+ 'Invalid value for "type" parameter in PaymentData',
+ 0,
+ 'paymentData.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in PaymentData', 0, 'paymentData.type', $value
+ 'Invalid value type for "type" parameter in PaymentData',
+ 0,
+ 'paymentData.type',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/B2b/Sberbank/VatData.php b/lib/Model/PaymentData/B2b/Sberbank/VatData.php
index 606fcf16..e817f3d0 100644
--- a/lib/Model/PaymentData/B2b/Sberbank/VatData.php
+++ b/lib/Model/PaymentData/B2b/Sberbank/VatData.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -95,13 +95,20 @@ class VatData extends AbstractObject implements VatDataInterface
{
if (TypeCast::canCastToEnumString($value)) {
if (!VatDataType::valueExists((string)$value)) {
- throw new InvalidPropertyValueException('Invalid B2bSberbankVatData.type value', 0,
- 'B2bSberbankVatData.type', $value);
+ throw new InvalidPropertyValueException(
+ 'Invalid B2bSberbankVatData.type value',
+ 0,
+ 'B2bSberbankVatData.type',
+ $value
+ );
}
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid B2bSberbankVatData.type value type', 0, 'B2bSberbankVatData.type', $value
+ 'Invalid B2bSberbankVatData.type value type',
+ 0,
+ 'B2bSberbankVatData.type',
+ $value
);
}
}
@@ -126,13 +133,20 @@ class VatData extends AbstractObject implements VatDataInterface
{
if (TypeCast::canCastToString($value)) {
if (!VatDataRate::valueExists((string)$value)) {
- throw new InvalidPropertyValueException('Invalid B2bSberbankVatData.rate value', 0,
- 'B2bSberbankVatData.rate', $value);
+ throw new InvalidPropertyValueException(
+ 'Invalid B2bSberbankVatData.rate value',
+ 0,
+ 'B2bSberbankVatData.rate',
+ $value
+ );
}
$this->_rate = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid B2bSberbankVatData.rate value type', 0, 'B2bSberbankVatData.rate', $value
+ 'Invalid B2bSberbankVatData.rate value type',
+ 0,
+ 'B2bSberbankVatData.rate',
+ $value
);
}
}
@@ -161,9 +175,11 @@ class VatData extends AbstractObject implements VatDataInterface
$this->_amount->fromArray($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid B2bSberbankVatData.amount value type', 0, 'B2bSberbankVatData.amount', $value
+ 'Invalid B2bSberbankVatData.amount value type',
+ 0,
+ 'B2bSberbankVatData.amount',
+ $value
);
}
}
-
}
diff --git a/lib/Model/PaymentData/B2b/Sberbank/VatDataInterface.php b/lib/Model/PaymentData/B2b/Sberbank/VatDataInterface.php
index 336129eb..66b9940b 100644
--- a/lib/Model/PaymentData/B2b/Sberbank/VatDataInterface.php
+++ b/lib/Model/PaymentData/B2b/Sberbank/VatDataInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -43,18 +43,17 @@ interface VatDataInterface
* Возвращает способ расчёта НДС
* @return string Способ расчёта НДС
*/
- function getType();
+ public function getType();
/**
* Возвращает данные об НДС
* @return string Данные об НДС
*/
- function getRate();
+ public function getRate();
/**
* Возвращает сумму НДС
* @return AmountInterface Сумма НДС
*/
- function getAmount();
+ public function getAmount();
}
-
diff --git a/lib/Model/PaymentData/B2b/Sberbank/VatDataRate.php b/lib/Model/PaymentData/B2b/Sberbank/VatDataRate.php
index c2af583c..2bcd3d65 100644
--- a/lib/Model/PaymentData/B2b/Sberbank/VatDataRate.php
+++ b/lib/Model/PaymentData/B2b/Sberbank/VatDataRate.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,11 @@ use YooKassa\Common\AbstractEnum;
/**
* PaymentDataB2bSberbankVatDataRate - Налоговая ставка НДС
- * |Код|Описание|
- * --- | ---
- * |7|7%|
- * |10|10%|
- * |18|18%|
- * |20|20%|
+ *
+ * - 7 - 7%
+ * - 10 - 10%
+ * - 18 - 18%
+ * - 20 - 20%
*/
class VatDataRate extends AbstractEnum
{
@@ -54,5 +53,4 @@ class VatDataRate extends AbstractEnum
self::RATE_18 => true,
self::RATE_20 => true,
);
-
}
diff --git a/lib/Model/PaymentData/B2b/Sberbank/VatDataType.php b/lib/Model/PaymentData/B2b/Sberbank/VatDataType.php
index 08a093b2..cca49393 100644
--- a/lib/Model/PaymentData/B2b/Sberbank/VatDataType.php
+++ b/lib/Model/PaymentData/B2b/Sberbank/VatDataType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,11 @@ use YooKassa\Common\AbstractEnum;
/**
* PaymentDataB2bSberbankVatDataType - Способ расчёта НДС
- * |Код|Описание|
- * --- | ---
- * |calculated|Сумма НДС включена в сумму платежа|
- * |mixed|Разные ставки НДС для разных товаров|
- * |untaxed|Сумма платежа НДС не облагается|
+ *
+ * Возможные значения:
+ * - calculated - Сумма НДС включена в сумму платежа
+ * - mixed - Разные ставки НДС для разных товаров
+ * - untaxed - Сумма платежа НДС не облагается
*/
class VatDataType extends AbstractEnum
{
@@ -50,5 +50,4 @@ class VatDataType extends AbstractEnum
self::MIXED => true,
self::UNTAXED => true,
);
-
}
diff --git a/lib/Model/PaymentData/PaymentDataAlfabank.php b/lib/Model/PaymentData/PaymentDataAlfabank.php
index c958a25d..6c2a1f40 100644
--- a/lib/Model/PaymentData/PaymentDataAlfabank.php
+++ b/lib/Model/PaymentData/PaymentDataAlfabank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class PaymentDataAlfabank extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::ALFABANK);
+ $this->setType(PaymentMethodType::ALFABANK);
}
/**
@@ -69,7 +69,10 @@ class PaymentDataAlfabank extends AbstractPaymentData
$this->_login = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid login value type', 0, 'PaymentDataAlfabank.login', $value
+ 'Invalid login value type',
+ 0,
+ 'PaymentDataAlfabank.login',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataApplePay.php b/lib/Model/PaymentData/PaymentDataApplePay.php
index de797af7..a6738643 100644
--- a/lib/Model/PaymentData/PaymentDataApplePay.php
+++ b/lib/Model/PaymentData/PaymentDataApplePay.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ class PaymentDataApplePay extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::APPLE_PAY);
+ $this->setType(PaymentMethodType::APPLE_PAY);
}
/**
@@ -67,13 +67,18 @@ class PaymentDataApplePay extends AbstractPaymentData
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for paymentData', 0, 'PaymentDataApplePay.paymentData'
+ 'Empty value for paymentData',
+ 0,
+ 'PaymentDataApplePay.paymentData'
);
} elseif (TypeCast::canCastToString($value)) {
$this->_paymentData = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for paymentData', 0, 'PaymentDataApplePay.paymentData', $value
+ 'Invalid value type for paymentData',
+ 0,
+ 'PaymentDataApplePay.paymentData',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataB2bSberbank.php b/lib/Model/PaymentData/PaymentDataB2bSberbank.php
index ebb3756b..135851a8 100644
--- a/lib/Model/PaymentData/PaymentDataB2bSberbank.php
+++ b/lib/Model/PaymentData/PaymentDataB2bSberbank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,7 @@ class PaymentDataB2bSberbank extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::B2B_SBERBANK);
+ $this->setType(PaymentMethodType::B2B_SBERBANK);
}
/**
@@ -72,19 +72,28 @@ class PaymentDataB2bSberbank extends AbstractPaymentData
public function setPaymentPurpose($value)
{
if ($value === null || $value === '') {
- throw new EmptyPropertyValueException('Empty paymentPurpose value', 0,
- 'PaymentDataB2bSberbank.paymentPurpose');
+ throw new EmptyPropertyValueException(
+ 'Empty paymentPurpose value',
+ 0,
+ 'PaymentDataB2bSberbank.paymentPurpose'
+ );
} elseif (TypeCast::canCastToString($value)) {
if (preg_match('/^.{1,210}$/', $value)) {
$this->_paymentPurpose = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid paymentPurpose value', 0, 'PaymentDataB2bSberbank.paymentPurpose', $value
+ 'Invalid paymentPurpose value',
+ 0,
+ 'PaymentDataB2bSberbank.paymentPurpose',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid paymentPurpose value type', 0, 'PaymentDataB2bSberbank.paymentPurpose', $value
+ 'Invalid paymentPurpose value type',
+ 0,
+ 'PaymentDataB2bSberbank.paymentPurpose',
+ $value
);
}
}
@@ -116,8 +125,10 @@ class PaymentDataB2bSberbank extends AbstractPaymentData
$this->_vatData = $vatData;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid vatData value type in PaymentDataB2BSberbank', 0,
- 'PaymentDataB2BSberbank.vatData', $value
+ 'Invalid vatData value type in PaymentDataB2BSberbank',
+ 0,
+ 'PaymentDataB2BSberbank.vatData',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataBankCard.php b/lib/Model/PaymentData/PaymentDataBankCard.php
index d536930b..e5bc8013 100644
--- a/lib/Model/PaymentData/PaymentDataBankCard.php
+++ b/lib/Model/PaymentData/PaymentDataBankCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class PaymentDataBankCard extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::BANK_CARD);
+ $this->setType(PaymentMethodType::BANK_CARD);
}
/**
@@ -75,7 +75,10 @@ class PaymentDataBankCard extends AbstractPaymentData
$this->_card = $card;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card value type in PaymentDataBankCard', 0, 'PaymentDataBankCard.card', $value
+ 'Invalid card value type in PaymentDataBankCard',
+ 0,
+ 'PaymentDataBankCard.card',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataBankCardCard.php b/lib/Model/PaymentData/PaymentDataBankCardCard.php
index 22bd27f1..d5a4e5d7 100644
--- a/lib/Model/PaymentData/PaymentDataBankCardCard.php
+++ b/lib/Model/PaymentData/PaymentDataBankCardCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -92,12 +92,18 @@ class PaymentDataBankCardCard extends AbstractObject
$this->_number = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card number value', 0, 'PaymentDataBankCardCard.number', $value
+ 'Invalid card number value',
+ 0,
+ 'PaymentDataBankCardCard.number',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card number value type', 0, 'PaymentDataBankCardCard.number', $value
+ 'Invalid card number value type',
+ 0,
+ 'PaymentDataBankCardCard.number',
+ $value
);
}
}
@@ -119,18 +125,26 @@ class PaymentDataBankCardCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card expiry year value', 0, 'PaymentDataBankCardCard.expiryYear'
+ 'Empty card expiry year value',
+ 0,
+ 'PaymentDataBankCardCard.expiryYear'
);
} elseif (is_numeric($value)) {
if (!preg_match('/^\d\d\d\d$/', $value) || $value < 2000 || $value > 2200) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry year value', 0, 'PaymentDataBankCardCard.expiryYear', $value
+ 'Invalid card expiry year value',
+ 0,
+ 'PaymentDataBankCardCard.expiryYear',
+ $value
);
}
$this->_expiryYear = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card expiry year value', 0, 'PaymentDataBankCardCard.expiryYear', $value
+ 'Invalid card expiry year value',
+ 0,
+ 'PaymentDataBankCardCard.expiryYear',
+ $value
);
}
}
@@ -152,12 +166,17 @@ class PaymentDataBankCardCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card expiry month value', 0, 'PaymentDataBankCardCard.expiryMonth'
+ 'Empty card expiry month value',
+ 0,
+ 'PaymentDataBankCardCard.expiryMonth'
);
} elseif (is_numeric($value)) {
if (!preg_match('/^\d\d$/', $value)) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'PaymentDataBankCardCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'PaymentDataBankCardCard.expiryMonth',
+ $value
);
}
if (is_string($value) && $value[0] == '0') {
@@ -167,14 +186,20 @@ class PaymentDataBankCardCard extends AbstractObject
}
if ($month < 1 || $month > 12) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'PaymentDataBankCardCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'PaymentDataBankCardCard.expiryMonth',
+ $value
);
} else {
$this->_expiryMonth = (string)$value;
}
} else {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'PaymentDataBankCardCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'PaymentDataBankCardCard.expiryMonth',
+ $value
);
}
}
@@ -196,19 +221,27 @@ class PaymentDataBankCardCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card CSC code value', 0, 'PaymentDataBankCardCard.csc'
+ 'Empty card CSC code value',
+ 0,
+ 'PaymentDataBankCardCard.csc'
);
} elseif (is_numeric($value)) {
if (preg_match('/^\d{3,4}$/', $value)) {
$this->_csc = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card CSC code value', 0, 'PaymentDataBankCardCard.csc', $value
+ 'Invalid card CSC code value',
+ 0,
+ 'PaymentDataBankCardCard.csc',
+ $value
);
}
} else {
throw new InvalidPropertyValueException(
- 'Invalid card CSC code value', 0, 'PaymentDataBankCardCard.csc', $value
+ 'Invalid card CSC code value',
+ 0,
+ 'PaymentDataBankCardCard.csc',
+ $value
);
}
}
@@ -230,19 +263,27 @@ class PaymentDataBankCardCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card holder value', 0, 'PaymentDataBankCardCard.cardholder'
+ 'Empty card holder value',
+ 0,
+ 'PaymentDataBankCardCard.cardholder'
);
} elseif (TypeCast::canCastToString($value)) {
if (preg_match('/^[a-zA-Z\s]{1,26}$/', $value)) {
$this->_cardholder = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card holder value', 0, 'PaymentDataBankCardCard.cardholder', $value
+ 'Invalid card holder value',
+ 0,
+ 'PaymentDataBankCardCard.cardholder',
+ $value
);
}
} else {
throw new InvalidPropertyValueException(
- 'Invalid card holder value', 0, 'PaymentDataBankCardCard.cardholder', $value
+ 'Invalid card holder value',
+ 0,
+ 'PaymentDataBankCardCard.cardholder',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataCash.php b/lib/Model/PaymentData/PaymentDataCash.php
index 1a699e5d..a8b7b088 100644
--- a/lib/Model/PaymentData/PaymentDataCash.php
+++ b/lib/Model/PaymentData/PaymentDataCash.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@ class PaymentDataCash extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::CASH);
+ $this->setType(PaymentMethodType::CASH);
}
/**
@@ -71,12 +71,18 @@ class PaymentDataCash extends AbstractPaymentData
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentDataCash.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentDataCash.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentDataCash.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentDataCash.phone',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataFactory.php b/lib/Model/PaymentData/PaymentDataFactory.php
index 3801c543..15c46bda 100644
--- a/lib/Model/PaymentData/PaymentDataFactory.php
+++ b/lib/Model/PaymentData/PaymentDataFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -65,9 +65,9 @@ class PaymentDataFactory
throw new \InvalidArgumentException('Invalid payment type value in payment factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid payment data type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid payment data type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
diff --git a/lib/Model/PaymentData/PaymentDataGooglePay.php b/lib/Model/PaymentData/PaymentDataGooglePay.php
index 3578ea09..8733392a 100644
--- a/lib/Model/PaymentData/PaymentDataGooglePay.php
+++ b/lib/Model/PaymentData/PaymentDataGooglePay.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +51,7 @@ class PaymentDataGooglePay extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::GOOGLE_PAY);
+ $this->setType(PaymentMethodType::GOOGLE_PAY);
}
/**
@@ -71,13 +71,18 @@ class PaymentDataGooglePay extends AbstractPaymentData
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for paymentMethodToken', 0, 'PaymentDataGooglePay.paymentMethodToken'
+ 'Empty value for paymentMethodToken',
+ 0,
+ 'PaymentDataGooglePay.paymentMethodToken'
);
} elseif (TypeCast::canCastToString($value)) {
$this->_paymentMethodToken = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for paymentMethodToken', 0, 'PaymentDataGooglePay.paymentMethodToken', $value
+ 'Invalid value type for paymentMethodToken',
+ 0,
+ 'PaymentDataGooglePay.paymentMethodToken',
+ $value
);
}
}
@@ -99,13 +104,18 @@ class PaymentDataGooglePay extends AbstractPaymentData
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for googleTransactionId', 0, 'PaymentDataGooglePay.googleTransactionId'
+ 'Empty value for googleTransactionId',
+ 0,
+ 'PaymentDataGooglePay.googleTransactionId'
);
} elseif (TypeCast::canCastToString($value)) {
$this->_googleTransactionId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for googleTransactionId', 0, 'PaymentDataGooglePay.googleTransactionId', $value
+ 'Invalid value type for googleTransactionId',
+ 0,
+ 'PaymentDataGooglePay.googleTransactionId',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataInstallments.php b/lib/Model/PaymentData/PaymentDataInstallments.php
index 4b2b5a1a..45aefcb5 100644
--- a/lib/Model/PaymentData/PaymentDataInstallments.php
+++ b/lib/Model/PaymentData/PaymentDataInstallments.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +35,6 @@ class PaymentDataInstallments extends AbstractPaymentData
{
public function __construct()
{
- $this->_setType(PaymentMethodType::INSTALLMENTS);
+ $this->setType(PaymentMethodType::INSTALLMENTS);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataMobileBalance.php b/lib/Model/PaymentData/PaymentDataMobileBalance.php
index 5a89280f..50633338 100644
--- a/lib/Model/PaymentData/PaymentDataMobileBalance.php
+++ b/lib/Model/PaymentData/PaymentDataMobileBalance.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ class PaymentDataMobileBalance extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::MOBILE_BALANCE);
+ $this->setType(PaymentMethodType::MOBILE_BALANCE);
}
/**
@@ -72,12 +72,18 @@ class PaymentDataMobileBalance extends AbstractPaymentData
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentDataMobileBalance.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentDataMobileBalance.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentDataMobileBalance.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentDataMobileBalance.phone',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataQiwi.php b/lib/Model/PaymentData/PaymentDataQiwi.php
index b1d2993e..6d994e97 100644
--- a/lib/Model/PaymentData/PaymentDataQiwi.php
+++ b/lib/Model/PaymentData/PaymentDataQiwi.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@ class PaymentDataQiwi extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::QIWI);
+ $this->setType(PaymentMethodType::QIWI);
}
/**
@@ -71,12 +71,18 @@ class PaymentDataQiwi extends AbstractPaymentData
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentDataQiwi.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentDataQiwi.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentDataQiwi.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentDataQiwi.phone',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataSberbank.php b/lib/Model/PaymentData/PaymentDataSberbank.php
index f8daf478..b1b7b0d5 100644
--- a/lib/Model/PaymentData/PaymentDataSberbank.php
+++ b/lib/Model/PaymentData/PaymentDataSberbank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +51,7 @@ class PaymentDataSberbank extends AbstractPaymentData
public function __construct()
{
- $this->_setType(PaymentMethodType::SBERBANK);
+ $this->setType(PaymentMethodType::SBERBANK);
}
/**
@@ -76,12 +76,18 @@ class PaymentDataSberbank extends AbstractPaymentData
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentDataSberbank.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentDataSberbank.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentDataSberbank.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentDataSberbank.phone',
+ $value
);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataSbp.php b/lib/Model/PaymentData/PaymentDataSbp.php
index 379b2c61..c633a57b 100644
--- a/lib/Model/PaymentData/PaymentDataSbp.php
+++ b/lib/Model/PaymentData/PaymentDataSbp.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::SBP);
+ $this->setType(PaymentMethodType::SBP);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataTinkoffBank.php b/lib/Model/PaymentData/PaymentDataTinkoffBank.php
index 20e5cf94..44c447be 100644
--- a/lib/Model/PaymentData/PaymentDataTinkoffBank.php
+++ b/lib/Model/PaymentData/PaymentDataTinkoffBank.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::TINKOFF_BANK);
+ $this->setType(PaymentMethodType::TINKOFF_BANK);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataWebmoney.php b/lib/Model/PaymentData/PaymentDataWebmoney.php
index d9a72d36..e679f312 100644
--- a/lib/Model/PaymentData/PaymentDataWebmoney.php
+++ b/lib/Model/PaymentData/PaymentDataWebmoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,6 @@ class PaymentDataWebmoney extends AbstractPaymentData
{
public function __construct()
{
- $this->_setType(PaymentMethodType::WEBMONEY);
+ $this->setType(PaymentMethodType::WEBMONEY);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataWechat.php b/lib/Model/PaymentData/PaymentDataWechat.php
index 90a835f8..a5be7210 100644
--- a/lib/Model/PaymentData/PaymentDataWechat.php
+++ b/lib/Model/PaymentData/PaymentDataWechat.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::WECHAT);
+ $this->setType(PaymentMethodType::WECHAT);
}
}
diff --git a/lib/Model/PaymentData/PaymentDataYooMoney.php b/lib/Model/PaymentData/PaymentDataYooMoney.php
index 45c32e73..b981a09a 100644
--- a/lib/Model/PaymentData/PaymentDataYooMoney.php
+++ b/lib/Model/PaymentData/PaymentDataYooMoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +35,6 @@ class PaymentDataYooMoney extends AbstractPaymentData
{
public function __construct()
{
- $this->_setType(PaymentMethodType::YOO_MONEY);
+ $this->setType(PaymentMethodType::YOO_MONEY);
}
}
diff --git a/lib/Model/PaymentInterface.php b/lib/Model/PaymentInterface.php
index 3157c4d4..045b6ee9 100644
--- a/lib/Model/PaymentInterface.php
+++ b/lib/Model/PaymentInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -70,7 +70,7 @@ interface PaymentInterface
* Возвращает идентификатор платежа
* @return string Идентификатор платежа
*/
- function getId();
+ public function getId();
/**
* Возвращает состояние платежа
diff --git a/lib/Model/PaymentMethod/AbstractPaymentMethod.php b/lib/Model/PaymentMethod/AbstractPaymentMethod.php
index 16e97d62..1ccd6e0e 100644
--- a/lib/Model/PaymentMethod/AbstractPaymentMethod.php
+++ b/lib/Model/PaymentMethod/AbstractPaymentMethod.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -75,23 +75,32 @@ abstract class AbstractPaymentMethod extends AbstractObject
* Устанавливает тип объекта
* @param string $value Тип объекта
*/
- protected function _setType($value)
+ protected function setType($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty payment data type', 0, 'PaymentMethod.type'
+ 'Empty payment data type',
+ 0,
+ 'PaymentMethod.type'
);
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (PaymentMethodType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in PaymentMethod', 0, 'PaymentMethod.type', $value
+ 'Invalid value for "type" parameter in PaymentMethod',
+ 0,
+ 'PaymentMethod.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in PaymentMethod', 0, 'PaymentMethod.type', $value
+ 'Invalid value type for "type" parameter in PaymentMethod',
+ 0,
+ 'PaymentMethod.type',
+ $value
);
}
}
@@ -141,7 +150,10 @@ abstract class AbstractPaymentMethod extends AbstractObject
$this->_saved = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid saved value type', 0, 'PaymentMethod.saved', $value
+ 'Invalid saved value type',
+ 0,
+ 'PaymentMethod.saved',
+ $value
);
}
}
diff --git a/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetails.php b/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetails.php
index 31af7d18..dfb3f50e 100644
--- a/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetails.php
+++ b/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -248,5 +248,4 @@ class PayerBankDetails extends AbstractObject implements PayerBankDetailsInterfa
{
$this->_account = $value;
}
-
}
diff --git a/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsInterface.php b/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsInterface.php
index 83d7ca7f..d553224f 100644
--- a/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsInterface.php
+++ b/lib/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,55 +47,53 @@ interface PayerBankDetailsInterface
* Возвращает полное наименование организации
* @return string Полное наименование организации
*/
- function getFullName();
+ public function getFullName();
/**
* Возвращает сокращенное наименование организации
* @return string Сокращенное наименование организации
*/
- function getShortName();
+ public function getShortName();
/**
* Возвращает адрес организации
* @return string Адрес организации
*/
- function getAddress();
+ public function getAddress();
/**
* Возвращает ИНН организации
* @return string ИНН организации
*/
- function getInn();
+ public function getInn();
/**
* Возвращает КПП организации
* @return string КПП организации
*/
- function getKpp();
+ public function getKpp();
/**
* Возвращает наименование банка организации
* @return string Наименование банка организации
*/
- function getBankName();
+ public function getBankName();
/**
* Возвращает отделение банка организации
* @return string Отделение банка организации
*/
- function getBankBranch();
+ public function getBankBranch();
/**
* Возвращает БИК банка организации
* @return string БИК банка организации
*/
- function getBankBik();
+ public function getBankBik();
/**
* Возвращает номер счета организации
* @return string Номер счета организации
*/
- function getAccount();
-
+ public function getAccount();
}
-
diff --git a/lib/Model/PaymentMethod/BankCard.php b/lib/Model/PaymentMethod/BankCard.php
index 50927e80..e1f3f2b6 100644
--- a/lib/Model/PaymentMethod/BankCard.php
+++ b/lib/Model/PaymentMethod/BankCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ use YooKassa\Helpers\TypeCast;
class BankCard extends AbstractObject
{
/**
- * @var string Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
+ * @var int Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
*/
const ISO_3166_CODE_LENGTH = 2;
@@ -113,17 +113,23 @@ class BankCard extends AbstractObject
*/
public function setFirst6($value)
{
- if (TypeCast::canCastToString($value)) {
+ if (TypeCast::canCastToString($value)) {
if (preg_match('/^[0-9]{6}$/', (string)$value)) {
$this->_first6 = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card first6 value', 0, 'BankCard.first6', $value
+ 'Invalid card first6 value',
+ 0,
+ 'BankCard.first6',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card first6 value type', 0, 'BankCard.first6', $value
+ 'Invalid card first6 value type',
+ 0,
+ 'BankCard.first6',
+ $value
);
}
}
@@ -152,12 +158,18 @@ class BankCard extends AbstractObject
$this->_last4 = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card last4 value', 0, 'BankCard.last4', $value
+ 'Invalid card last4 value',
+ 0,
+ 'BankCard.last4',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card last4 value type', 0, 'BankCard.last4', $value
+ 'Invalid card last4 value type',
+ 0,
+ 'BankCard.last4',
+ $value
);
}
}
@@ -179,20 +191,28 @@ class BankCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card expiry year value', 0, 'BankCard.expiryYear'
+ 'Empty card expiry year value',
+ 0,
+ 'BankCard.expiryYear'
);
}
if (is_numeric($value)) {
if (!preg_match('/^\d\d\d\d$/', $value) || $value < 2000 || $value > 2200) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry year value', 0, 'BankCard.expiryYear', $value
+ 'Invalid card expiry year value',
+ 0,
+ 'BankCard.expiryYear',
+ $value
);
}
$this->_expiryYear = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card expiry year value', 0, 'BankCard.expiryYear', $value
+ 'Invalid card expiry year value',
+ 0,
+ 'BankCard.expiryYear',
+ $value
);
}
}
@@ -214,14 +234,19 @@ class BankCard extends AbstractObject
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty card expiry month value', 0, 'BankCard.expiryMonth'
+ 'Empty card expiry month value',
+ 0,
+ 'BankCard.expiryMonth'
);
}
if (is_numeric($value)) {
if (!preg_match('/^\d\d$/', $value)) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'BankCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'BankCard.expiryMonth',
+ $value
);
}
if (is_string($value) && $value[0] == '0') {
@@ -231,14 +256,20 @@ class BankCard extends AbstractObject
}
if ($month < 1 || $month > 12) {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'BankCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'BankCard.expiryMonth',
+ $value
);
}
$this->_expiryMonth = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card expiry month value', 0, 'BankCard.expiryMonth', $value
+ 'Invalid card expiry month value',
+ 0,
+ 'BankCard.expiryMonth',
+ $value
);
}
}
@@ -266,7 +297,10 @@ class BankCard extends AbstractObject
$this->_cardType = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid cardType value type', 0, 'BankCard.cardType', $value
+ 'Invalid cardType value type',
+ 0,
+ 'BankCard.cardType',
+ $value
);
}
}
@@ -291,11 +325,17 @@ class BankCard extends AbstractObject
$this->_issuerCountry = (string)$value;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid issuerCountry value type', 0, 'PaymentMethodBankCard.issuerCountry', $value
+ 'Invalid issuerCountry value type',
+ 0,
+ 'PaymentMethodBankCard.issuerCountry',
+ $value
);
} elseif (mb_strlen($value) !== self::ISO_3166_CODE_LENGTH) {
throw new InvalidPropertyValueException(
- 'Invalid issuerCountry value', 0, 'PaymentMethodBankCard.issuerCountry', $value
+ 'Invalid issuerCountry value',
+ 0,
+ 'PaymentMethodBankCard.issuerCountry',
+ $value
);
}
@@ -312,7 +352,9 @@ class BankCard extends AbstractObject
$this->_issuerName = (string)$value;
} elseif (!TypeCast::canCastToString($value)) {
throw new EmptyPropertyValueException(
- 'Empty issuerName value', 0, 'PaymentMethodBankCard.issuerName'
+ 'Empty issuerName value',
+ 0,
+ 'PaymentMethodBankCard.issuerName'
);
}
@@ -338,11 +380,17 @@ class BankCard extends AbstractObject
$this->_source = (string)$value;
} elseif (!TypeCast::canCastToEnumString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid source value type', 0, 'PaymentMethodBankCard.source', $value
+ 'Invalid source value type',
+ 0,
+ 'PaymentMethodBankCard.source',
+ $value
);
} elseif (!BankCardSource::valueExists($value)) {
throw new InvalidPropertyValueException(
- 'Invalid source value', 0, 'PaymentMethodBankCard.source', $value
+ 'Invalid source value',
+ 0,
+ 'PaymentMethodBankCard.source',
+ $value
);
}
diff --git a/lib/Model/PaymentMethod/BankCardSource.php b/lib/Model/PaymentMethod/BankCardSource.php
index 0573c9c7..807f84db 100644
--- a/lib/Model/PaymentMethod/BankCardSource.php
+++ b/lib/Model/PaymentMethod/BankCardSource.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,22 +26,23 @@
namespace YooKassa\Model\PaymentMethod;
-
use YooKassa\Common\AbstractEnum;
/**
* BankCardSource - Источник данных банковской карты
- * |Код|Описание|
- * --- | ---
- * |apple_pay|Источник данных apple_pay|
- * |google_pay|Источник данных google_pay|
- * |mir_pay|Источник данных mir_pay|
*
+ * Возможные значения:
+ * - apple_pay - Источник данных ApplePay
+ * - google_pay - Источник данных GooglePay
+ * - mir_pay - Источник данных MirPay
*/
class BankCardSource extends AbstractEnum
{
+ /** Источник данных ApplePay */
const APPLE_PAY = 'apple_pay';
+ /** Источник данных GooglePay */
const GOOGLE_PAY = 'google_pay';
+ /** Источник данных MirPay */
const MIR_PAY = 'mir_pay';
protected static $validValues = array(
diff --git a/lib/Model/PaymentMethod/PaymentMethodAlfaBank.php b/lib/Model/PaymentMethod/PaymentMethodAlfaBank.php
index c61c47c8..80bf125a 100644
--- a/lib/Model/PaymentMethod/PaymentMethodAlfaBank.php
+++ b/lib/Model/PaymentMethod/PaymentMethodAlfaBank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class PaymentMethodAlfaBank extends AbstractPaymentMethod
public function __construct()
{
- $this->_setType(PaymentMethodType::ALFABANK);
+ $this->setType(PaymentMethodType::ALFABANK);
}
/**
@@ -69,7 +69,10 @@ class PaymentMethodAlfaBank extends AbstractPaymentMethod
$this->_login = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid login value type', 0, 'PaymentMethodAlfaBank.login', $value
+ 'Invalid login value type',
+ 0,
+ 'PaymentMethodAlfaBank.login',
+ $value
);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodApplePay.php b/lib/Model/PaymentMethod/PaymentMethodApplePay.php
index fc77e595..f442b89a 100644
--- a/lib/Model/PaymentMethod/PaymentMethodApplePay.php
+++ b/lib/Model/PaymentMethod/PaymentMethodApplePay.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodApplePay extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::APPLE_PAY);
+ $this->setType(PaymentMethodType::APPLE_PAY);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodB2bSberbank.php b/lib/Model/PaymentMethod/PaymentMethodB2bSberbank.php
index b5b47b85..33708f8b 100644
--- a/lib/Model/PaymentMethod/PaymentMethodB2bSberbank.php
+++ b/lib/Model/PaymentMethod/PaymentMethodB2bSberbank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -59,7 +59,7 @@ class PaymentMethodB2bSberbank extends AbstractPaymentMethod
public function __construct()
{
- $this->_setType(PaymentMethodType::B2B_SBERBANK);
+ $this->setType(PaymentMethodType::B2B_SBERBANK);
}
/**
@@ -91,20 +91,19 @@ class PaymentMethodB2bSberbank extends AbstractPaymentMethod
/**
* Устанавливает назначение платежа
- * @param VatData $vatData Данные об НДС
+ * @param VatData|array $vatData Данные об НДС
*/
public function setVatData($vatData)
{
- if(is_array($vatData)) {
+ if (is_array($vatData)) {
$value = new VatData();
$value->fromArray($vatData);
$this->_vatData = $value;
- } else if($vatData instanceof VatData){
+ } elseif ($vatData instanceof VatData) {
$this->_vatData = $vatData;
- } else{
+ } else {
throw new InvalidPropertyValueException('Invalid $vatData property type');
}
-
}
/**
@@ -122,13 +121,13 @@ class PaymentMethodB2bSberbank extends AbstractPaymentMethod
*/
public function setPayerBankDetails($payerBankDetails)
{
- if(is_array($payerBankDetails)) {
+ if (is_array($payerBankDetails)) {
$value = new PayerBankDetails();
$value->fromArray($payerBankDetails);
$this->_payerBankDetails = $value;
- } else if($payerBankDetails instanceof PayerBankDetails){
+ } elseif ($payerBankDetails instanceof PayerBankDetails) {
$this->_payerBankDetails = $payerBankDetails;
- } else{
+ } else {
throw new InvalidPropertyValueException('Invalid $payerBankDetails property type');
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodBankCard.php b/lib/Model/PaymentMethod/PaymentMethodBankCard.php
index 9c567123..cee23674 100644
--- a/lib/Model/PaymentMethod/PaymentMethodBankCard.php
+++ b/lib/Model/PaymentMethod/PaymentMethodBankCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -39,7 +39,7 @@ use YooKassa\Model\PaymentMethodType;
class PaymentMethodBankCard extends AbstractPaymentMethod
{
/**
- * @var string Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
+ * @var int Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
* @deprecated Будет удален в следующих версиях
*/
const ISO_3166_CODE_LENGTH = 2;
@@ -51,7 +51,7 @@ class PaymentMethodBankCard extends AbstractPaymentMethod
public function __construct()
{
- $this->_setType(PaymentMethodType::BANK_CARD);
+ $this->setType(PaymentMethodType::BANK_CARD);
}
/**
@@ -160,7 +160,10 @@ class PaymentMethodBankCard extends AbstractPaymentMethod
$this->_card = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card value type', 0, 'PaymentMethodBankCard.card', $value
+ 'Invalid card value type',
+ 0,
+ 'PaymentMethodBankCard.card',
+ $value
);
}
}
@@ -177,5 +180,4 @@ class PaymentMethodBankCard extends AbstractPaymentMethod
}
return $return;
}
-
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodCardType.php b/lib/Model/PaymentMethod/PaymentMethodCardType.php
index c7e24173..ef72b692 100644
--- a/lib/Model/PaymentMethod/PaymentMethodCardType.php
+++ b/lib/Model/PaymentMethod/PaymentMethodCardType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,14 +29,23 @@ namespace YooKassa\Model\PaymentMethod;
use YooKassa\Common\AbstractEnum;
/**
- * Тип банковской карты. Возможные значения:
+ * PaymentMethodCardType - Тип банковской карты.
+ *
+ * Возможные значения:
* - `MasterCard` (для карт Mastercard и Maestro),
* - `Visa` (для карт Visa и Visa Electron),
* - `Mir`,
* - `UnionPay`,
* - `JCB`,
* - `AmericanExpress`,
- * - `DinersClub`
+ * - `DinersClub`,
+ * - `DiscoverCard`,
+ * - `InstaPayment`,
+ * - `InstaPaymentTM`,
+ * - `Laser`,
+ * - `Dankort`,
+ * - `Solo`,
+ * - `Switch`,
* - `Unknown`.
*/
class PaymentMethodCardType extends AbstractEnum
@@ -48,16 +57,30 @@ class PaymentMethodCardType extends AbstractEnum
const JCB = 'JCB';
const AMERICAN_EXPRESS = 'AmericanExpress';
const DINERS_CLUB = 'DinersClub';
+ const DISCOVER_CARD_CLUB = 'DiscoverCard';
+ const INSTA_PAYMENT_CLUB = 'InstaPayment';
+ const INSTA_PAYMENT_TM_CLUB = 'InstaPaymentTM';
+ const LASER_CLUB = 'Laser';
+ const DANKORT_CLUB = 'Dankort';
+ const SOLO_CLUB = 'Solo';
+ const SWITCH_CLUB = 'Switch';
const UNKNOWN = 'Unknown';
protected static $validValues = array(
- self::MASTER_CARD => true,
- self::VISA => true,
- self::MIR => true,
- self::UNION_PAY => true,
- self::JCB => true,
- self::AMERICAN_EXPRESS => true,
- self::DINERS_CLUB => true,
- self::UNKNOWN => true,
+ self::MASTER_CARD => true,
+ self::VISA => true,
+ self::MIR => true,
+ self::UNION_PAY => true,
+ self::JCB => true,
+ self::AMERICAN_EXPRESS => true,
+ self::DINERS_CLUB => true,
+ self::DISCOVER_CARD_CLUB => true,
+ self::INSTA_PAYMENT_CLUB => true,
+ self::INSTA_PAYMENT_TM_CLUB => true,
+ self::LASER_CLUB => true,
+ self::DANKORT_CLUB => true,
+ self::SOLO_CLUB => true,
+ self::SWITCH_CLUB => true,
+ self::UNKNOWN => true,
);
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodCash.php b/lib/Model/PaymentMethod/PaymentMethodCash.php
index 9e2a4f2e..bd775fe3 100644
--- a/lib/Model/PaymentMethod/PaymentMethodCash.php
+++ b/lib/Model/PaymentMethod/PaymentMethodCash.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodCash extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::CASH);
+ $this->setType(PaymentMethodType::CASH);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodFactory.php b/lib/Model/PaymentMethod/PaymentMethodFactory.php
index 26e6b06c..6482e7c1 100644
--- a/lib/Model/PaymentMethod/PaymentMethodFactory.php
+++ b/lib/Model/PaymentMethod/PaymentMethodFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -71,9 +71,9 @@ class PaymentMethodFactory
throw new \InvalidArgumentException('Invalid payment method type value in payment factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid payment method data type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid payment method data type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
@@ -110,7 +110,7 @@ class PaymentMethodFactory
foreach ($data as $key => $value) {
if ($paymentData->offsetExists($key)) {
$paymentData->offsetSet($key, $value);
- } else if (is_array($value)) {
+ } elseif (is_array($value)) {
$this->fillModel($paymentData, $value);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodGooglePay.php b/lib/Model/PaymentMethod/PaymentMethodGooglePay.php
index 8c088058..3cbea0a9 100644
--- a/lib/Model/PaymentMethod/PaymentMethodGooglePay.php
+++ b/lib/Model/PaymentMethod/PaymentMethodGooglePay.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodGooglePay extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::GOOGLE_PAY);
+ $this->setType(PaymentMethodType::GOOGLE_PAY);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodInstallments.php b/lib/Model/PaymentMethod/PaymentMethodInstallments.php
index 2f600968..2620ef1c 100644
--- a/lib/Model/PaymentMethod/PaymentMethodInstallments.php
+++ b/lib/Model/PaymentMethod/PaymentMethodInstallments.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodInstallments extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::INSTALLMENTS);
+ $this->setType(PaymentMethodType::INSTALLMENTS);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodMobileBalance.php b/lib/Model/PaymentMethod/PaymentMethodMobileBalance.php
index 25e323c4..c12934ec 100644
--- a/lib/Model/PaymentMethod/PaymentMethodMobileBalance.php
+++ b/lib/Model/PaymentMethod/PaymentMethodMobileBalance.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,7 @@ class PaymentMethodMobileBalance extends AbstractPaymentMethod
public function __construct()
{
- $this->_setType(PaymentMethodType::MOBILE_BALANCE);
+ $this->setType(PaymentMethodType::MOBILE_BALANCE);
}
/**
@@ -73,12 +73,18 @@ class PaymentMethodMobileBalance extends AbstractPaymentMethod
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentMethodMobileBalance.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentMethodMobileBalance.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentMethodMobileBalance.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentMethodMobileBalance.phone',
+ $value
);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodPsb.php b/lib/Model/PaymentMethod/PaymentMethodPsb.php
index 52d70754..7aebac98 100644
--- a/lib/Model/PaymentMethod/PaymentMethodPsb.php
+++ b/lib/Model/PaymentMethod/PaymentMethodPsb.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::PSB);
+ $this->setType(PaymentMethodType::PSB);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodQiwi.php b/lib/Model/PaymentMethod/PaymentMethodQiwi.php
index b93ec736..abfc7a0a 100644
--- a/lib/Model/PaymentMethod/PaymentMethodQiwi.php
+++ b/lib/Model/PaymentMethod/PaymentMethodQiwi.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodQiwi extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::QIWI);
+ $this->setType(PaymentMethodType::QIWI);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodSberbank.php b/lib/Model/PaymentMethod/PaymentMethodSberbank.php
index 34533089..cccc2222 100644
--- a/lib/Model/PaymentMethod/PaymentMethodSberbank.php
+++ b/lib/Model/PaymentMethod/PaymentMethodSberbank.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class PaymentMethodSberbank extends PaymentMethodBankCard
public function __construct()
{
- $this->_setType(PaymentMethodType::SBERBANK);
+ $this->setType(PaymentMethodType::SBERBANK);
}
/**
@@ -79,14 +79,19 @@ class PaymentMethodSberbank extends PaymentMethodBankCard
$this->_phone = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid phone value', 0, 'PaymentMethodSberbank.phone', $value
+ 'Invalid phone value',
+ 0,
+ 'PaymentMethodSberbank.phone',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid phone value type', 0, 'PaymentMethodSberbank.phone', $value
+ 'Invalid phone value type',
+ 0,
+ 'PaymentMethodSberbank.phone',
+ $value
);
}
}
-
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodSbp.php b/lib/Model/PaymentMethod/PaymentMethodSbp.php
index e3f31bb6..093f3a92 100644
--- a/lib/Model/PaymentMethod/PaymentMethodSbp.php
+++ b/lib/Model/PaymentMethod/PaymentMethodSbp.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::SBP);
+ $this->setType(PaymentMethodType::SBP);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodTinkoffBank.php b/lib/Model/PaymentMethod/PaymentMethodTinkoffBank.php
index f33faff0..4683d2a9 100644
--- a/lib/Model/PaymentMethod/PaymentMethodTinkoffBank.php
+++ b/lib/Model/PaymentMethod/PaymentMethodTinkoffBank.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::TINKOFF_BANK);
+ $this->setType(PaymentMethodType::TINKOFF_BANK);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodWebmoney.php b/lib/Model/PaymentMethod/PaymentMethodWebmoney.php
index d215f2e1..9eebf902 100644
--- a/lib/Model/PaymentMethod/PaymentMethodWebmoney.php
+++ b/lib/Model/PaymentMethod/PaymentMethodWebmoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,6 @@ class PaymentMethodWebmoney extends AbstractPaymentMethod
{
public function __construct()
{
- $this->_setType(PaymentMethodType::WEBMONEY);
+ $this->setType(PaymentMethodType::WEBMONEY);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodWechat.php b/lib/Model/PaymentMethod/PaymentMethodWechat.php
index 85924c35..061c4a92 100644
--- a/lib/Model/PaymentMethod/PaymentMethodWechat.php
+++ b/lib/Model/PaymentMethod/PaymentMethodWechat.php
@@ -1,8 +1,9 @@
_setType(PaymentMethodType::WECHAT);
+ $this->setType(PaymentMethodType::WECHAT);
}
}
diff --git a/lib/Model/PaymentMethod/PaymentMethodYooMoney.php b/lib/Model/PaymentMethod/PaymentMethodYooMoney.php
index 8d51e30f..043d78b1 100644
--- a/lib/Model/PaymentMethod/PaymentMethodYooMoney.php
+++ b/lib/Model/PaymentMethod/PaymentMethodYooMoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,7 @@ class PaymentMethodYooMoney extends AbstractPaymentMethod
public function __construct()
{
- $this->_setType(PaymentMethodType::YOO_MONEY);
+ $this->setType(PaymentMethodType::YOO_MONEY);
}
/**
@@ -68,19 +68,27 @@ class PaymentMethodYooMoney extends AbstractPaymentMethod
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty accountNumber value', 0, 'PaymentMethodYooMoney.accountNumber'
+ 'Empty accountNumber value',
+ 0,
+ 'PaymentMethodYooMoney.accountNumber'
);
} elseif (TypeCast::canCastToString($value)) {
if (preg_match('/^[0-9]{11,33}$/', $value)) {
$this->_accountNumber = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid accountNumber value', 0, 'PaymentMethodYooMoney.accountNumber', $value
+ 'Invalid accountNumber value',
+ 0,
+ 'PaymentMethodYooMoney.accountNumber',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid accountNumber value type', 0, 'PaymentMethodYooMoney.accountNumber', $value
+ 'Invalid accountNumber value type',
+ 0,
+ 'PaymentMethodYooMoney.accountNumber',
+ $value
);
}
}
diff --git a/lib/Model/PaymentMethodType.php b/lib/Model/PaymentMethodType.php
index 8c47663c..de32e81f 100644
--- a/lib/Model/PaymentMethodType.php
+++ b/lib/Model/PaymentMethodType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,24 +30,24 @@ use YooKassa\Common\AbstractEnum;
/**
* PaymentMethodType - Тип источника средств для проведения платежа
- * |Код|Описание|
- * --- | ---
- * |yoo_money|Платеж из кошелька ЮMoney|
- * |bank_card|Платеж с произвольной банковской карты|
- * |sberbank|Платеж СбербанкОнлайн|
- * |cash|Платеж наличными|
- * |mobile_balance|Платеж с баланса мобильного телефона|
- * |apple_pay|Платеж ApplePay|
- * |google_pay|Платеж Google Pay|
- * |qiwi|Платеж из кошелька Qiwi|
- * |webmoney|Платеж из кошелька Webmoney|
- * |alfabank|Платеж через Альфа-Клик|
- * |b2b_sberbank|Сбербанк Бизнес Онлайн|
- * |tinkoff_bank|Интернет-банк Тинькофф|
- * |psb|ПромсвязьБанк|
- * |installments|Заплатить по частям|
- * |wechat|Платеж через WeChat|
- * |sbp|Платеж через через сервис быстрых платежей|
+ *
+ * Возможные значения:
+ * - `yoo_money` - Платеж из кошелька ЮMoney
+ * - `bank_card` - Платеж с произвольной банковской карты
+ * - `sberbank` - Платеж СбербанкОнлайн
+ * - `cash` - Платеж наличными
+ * - `mobile_balance` - Платеж с баланса мобильного телефона
+ * - `apple_pay` - Платеж ApplePay
+ * - `google_pay` - Платеж Google Pay
+ * - `qiwi` - Платеж из кошелька Qiwi
+ * - `webmoney` - Платеж из кошелька Webmoney
+ * - `alfabank` - Платеж через Альфа-Клик
+ * - `b2b_sberbank` - Сбербанк Бизнес Онлайн
+ * - `tinkoff_bank` - Интернет-банк Тинькофф
+ * - `psb` - ПромсвязьБанк
+ * - `installments` - Заплатить по частям
+ * - `wechat` - Платеж через WeChat
+ * - `sbp` - Платеж через через сервис быстрых платежей
*/
class PaymentMethodType extends AbstractEnum
{
diff --git a/lib/Model/PaymentStatus.php b/lib/Model/PaymentStatus.php
index d6a639e7..e71cde13 100644
--- a/lib/Model/PaymentStatus.php
+++ b/lib/Model/PaymentStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,13 +30,12 @@ use YooKassa\Common\AbstractEnum;
/**
* PaymentStatus - Состояние платежа
- * |Код|Описание|
- * --- | ---
- * |pending|Ожидает оплаты покупателем|
- * |waiting_for_capture|Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)|
- * |succeeded|Успешно оплачен и подтвержден магазином|
- * |canceled|Неуспех оплаты или отменен магазином (cancel)|
*
+ * Возможные значения:
+ * - `pending` - Ожидает оплаты покупателем
+ * - `waiting_for_capture` - Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)
+ * - `succeeded` - Успешно оплачен и подтвержден магазином
+ * - `canceled` - Неуспех оплаты или отменен магазином (cancel)
*/
class PaymentStatus extends AbstractEnum
{
diff --git a/lib/Model/Payout.php b/lib/Model/Payout.php
index f1dbb080..0b8a0bca 100644
--- a/lib/Model/Payout.php
+++ b/lib/Model/Payout.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -35,8 +35,10 @@ use YooKassa\Helpers\TypeCast;
use YooKassa\Model\Deal\PayoutDealInfo;
use YooKassa\Model\PaymentMethod\AbstractPaymentMethod;
use YooKassa\Model\Payout\AbstractPayoutDestination;
+use YooKassa\Model\Payout\IncomeReceipt;
use YooKassa\Model\Payout\PayoutCancellationDetails;
use YooKassa\Model\Payout\PayoutDestinationFactory;
+use YooKassa\Model\Payout\PayoutSelfEmployed;
/**
* Payout - Данные о выплате
@@ -50,6 +52,9 @@ use YooKassa\Model\Payout\PayoutDestinationFactory;
* @property DateTime $createdAt Время создания заказа
* @property DateTime $created_at Время создания заказа
* @property PayoutDealInfo $deal Сделка, в рамках которой нужно провести выплату
+ * @property PayoutSelfEmployed $self_employed Данные самозанятого, который получит выплату
+ * @property PayoutSelfEmployed $selfEmployed Данные самозанятого, который получит выплату
+ * @property IncomeReceipt $receipt Данные чека, зарегистрированного в ФНС
* @property CancellationDetailsInterface $cancellationDetails Комментарий к отмене выплаты
* @property CancellationDetailsInterface $cancellation_details Комментарий к отмене выплаты
* @property Metadata $metadata Метаданные выплаты указанные мерчантом
@@ -95,6 +100,16 @@ class Payout extends AbstractObject implements PayoutInterface
*/
private $_deal;
+ /**
+ * @var PayoutSelfEmployed|null Данные самозанятого, который получит выплату. Присутствует, если вы делаете выплату самозанятому
+ */
+ private $_self_employed;
+
+ /**
+ * @var IncomeReceipt|null Данные чека, зарегистрированного в ФНС. Присутствует, если вы делаете выплату самозанятому.
+ */
+ private $_receipt;
+
/**
* @var PayoutCancellationDetails Комментарий к статусу canceled: кто отменил выплаты и по какой причине
*/
@@ -150,19 +165,23 @@ class Payout extends AbstractObject implements PayoutInterface
/**
* Устанавливает сумму выплаты
- * @param AmountInterface|array $value Сумма выплаты
+ * @param AmountInterface|array|null $value Сумма выплаты
*/
- public function setAmount($value)
+ public function setAmount($value = null)
{
- if ($value === null || $value === '') {
+ if ($value === null || $value === '' || (is_array($value) && empty($value))) {
throw new EmptyPropertyValueException('Empty amount value', 0, 'Payout.amount');
- } elseif ($value instanceof AmountInterface) {
+ }
+ if ($value instanceof AmountInterface) {
$this->_amount = $value;
} elseif (is_array($value)) {
$this->_amount = new MonetaryAmount($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid Payout.amount value type', 0, 'Payout.amount', $value
+ 'Invalid Payout.amount value type',
+ 0,
+ 'Payout.amount',
+ $value
);
}
}
@@ -192,7 +211,10 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_status = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid Payout status value type', 0, 'Payout.status', $value
+ 'Invalid Payout status value type',
+ 0,
+ 'Payout.status',
+ $value
);
}
}
@@ -230,7 +252,10 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'CreatePayoutRequest.description', $value
+ 'Invalid description value type',
+ 0,
+ 'CreatePayoutRequest.description',
+ $value
);
}
}
@@ -246,18 +271,18 @@ class Payout extends AbstractObject implements PayoutInterface
/**
* Устанавливает используемый способ проведения выплаты
- * @param AbstractPayoutDestination|array $value Способ проведения выплаты
+ * @param AbstractPayoutDestination|array|null $value Способ проведения выплаты
*/
public function setPayoutDestination($value)
{
- if ($value === null || $value === '') {
+ if ($value === null || (is_array($value) && empty($value))) {
$this->_payout_destination = null;
} elseif ($value instanceof AbstractPayoutDestination) {
$this->_payout_destination = $value;
} elseif (is_array($value)) {
$factory = new PayoutDestinationFactory();
$this->_payout_destination = $factory->factoryFromArray($value);
- } else {
+ } else {
throw new InvalidPropertyValueTypeException('Invalid payout_destination value type', 0, 'Payout.payout_destination', $value);
}
@@ -308,7 +333,7 @@ class Payout extends AbstractObject implements PayoutInterface
/**
* Устанавливает метаданные выплаты
- * @param Metadata|array $value Метаданные выплаты указанные мерчантом
+ * @param Metadata|array|null $value Метаданные выплаты указанные мерчантом
*/
public function setMetadata($value)
{
@@ -320,7 +345,10 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_metadata = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "metadata" parameter in Payout', 0, 'Payout.metadata', $value
+ 'Invalid value type for "metadata" parameter in Payout',
+ 0,
+ 'Payout.metadata',
+ $value
);
}
return $this;
@@ -342,7 +370,7 @@ class Payout extends AbstractObject implements PayoutInterface
*/
public function setCancellationDetails($value)
{
- if ($value === null) {
+ if ($value === null || (is_array($value) && empty($value))) {
$this->_cancellationDetails = null;
} elseif (is_array($value)) {
$this->_cancellationDetails = new PayoutCancellationDetails($value);
@@ -350,7 +378,10 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_cancellationDetails = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "cancellation_details" parameter in Payout', 0, 'Payout.cancellation_details', $value
+ 'Invalid value type for "cancellation_details" parameter in Payout',
+ 0,
+ 'Payout.cancellation_details',
+ $value
);
}
}
@@ -376,7 +407,10 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_test = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid Payout test flag value type', 0, 'Payout.test', $value
+ 'Invalid Payout test flag value type',
+ 0,
+ 'Payout.test',
+ $value
);
}
}
@@ -392,11 +426,11 @@ class Payout extends AbstractObject implements PayoutInterface
/**
* Устанавливает сделку, в рамках которой нужно провести выплату
- * @param PayoutDealInfo|array $value Сделка, в рамках которой нужно провести выплату
+ * @param PayoutDealInfo|array|null $value Сделка, в рамках которой нужно провести выплату
*/
public function setDeal($value)
{
- if ($value === null || $value === '') {
+ if ($value === null || (is_array($value) && empty($value))) {
$this->_deal = null;
} elseif (is_array($value)) {
$this->_deal = new PayoutDealInfo($value);
@@ -404,9 +438,86 @@ class Payout extends AbstractObject implements PayoutInterface
$this->_deal = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "deal" parameter in Payout', 0, 'Payout.deal', $value
+ 'Invalid value type for "deal" parameter in Payout',
+ 0,
+ 'Payout.deal',
+ $value
);
}
return $this;
}
+
+ /**
+ * Возвращает данные самозанятого, который получит выплату.
+ *
+ * @return PayoutSelfEmployed|null Данные самозанятого, который получит выплату
+ */
+ public function getSelfEmployed()
+ {
+ return $this->_self_employed;
+ }
+
+ /**
+ * Устанавливает данные самозанятого, который получит выплату.
+ *
+ * @param PayoutSelfEmployed|array|null $value Данные самозанятого, который получит выплату
+ *
+ * @return $this
+ */
+ public function setSelfEmployed($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_self_employed = null;
+ } elseif (is_array($value)) {
+ $this->_self_employed = new PayoutSelfEmployed($value);
+ } elseif ($value instanceof PayoutSelfEmployed) {
+ $this->_self_employed = $value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "self_employed" parameter in Payout',
+ 0,
+ 'Payout.self_employed',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает данные чека, зарегистрированного в ФНС.
+ *
+ * @return IncomeReceipt|null Данные чека, зарегистрированного в ФНС
+ */
+ public function getReceipt()
+ {
+ return $this->_receipt;
+ }
+
+ /**
+ * Устанавливает данные чека, зарегистрированного в ФНС.
+ *
+ * @param IncomeReceipt|array|null $value Данные чека, зарегистрированного в ФНС
+ *
+ * @return $this
+ */
+ public function setReceipt($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_receipt = null;
+ } elseif (is_array($value)) {
+ $this->_receipt = new IncomeReceipt($value);
+ } elseif ($value instanceof IncomeReceipt) {
+ $this->_receipt = $value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "receipt" parameter in Payout',
+ 0,
+ 'Payout.receipt',
+ $value
+ );
+ }
+
+ return $this;
+ }
}
diff --git a/lib/Model/Payout/AbstractPayoutDestination.php b/lib/Model/Payout/AbstractPayoutDestination.php
index 07502d9e..4917675d 100644
--- a/lib/Model/Payout/AbstractPayoutDestination.php
+++ b/lib/Model/Payout/AbstractPayoutDestination.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -57,23 +57,32 @@ abstract class AbstractPayoutDestination extends AbstractObject
* Устанавливает тип метода оплаты
* @param string $value Тип метода оплаты
*/
- protected function _setType($value)
+ protected function setType($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty PayoutDestinationData data type', 0, 'PayoutDestinationData.type'
+ 'Empty PayoutDestinationData data type',
+ 0,
+ 'PayoutDestinationData.type'
);
- } elseif (TypeCast::canCastToEnumString($value)) {
+ }
+ if (TypeCast::canCastToEnumString($value)) {
if (PaymentMethodType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in PayoutDestinationData', 0, 'PayoutDestinationData.type', $value
+ 'Invalid value for "type" parameter in PayoutDestinationData',
+ 0,
+ 'PayoutDestinationData.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in PayoutDestinationData', 0, 'PayoutDestinationData.type', $value
+ 'Invalid value type for "type" parameter in PayoutDestinationData',
+ 0,
+ 'PayoutDestinationData.type',
+ $value
);
}
}
diff --git a/lib/Model/Payout/IncomeReceipt.php b/lib/Model/Payout/IncomeReceipt.php
new file mode 100644
index 00000000..38ea2843
--- /dev/null
+++ b/lib/Model/Payout/IncomeReceipt.php
@@ -0,0 +1,238 @@
+/print`
+ *
+ * @var string|null
+ */
+ private $_url;
+
+ /**
+ * Сумма, указанная в чеке. Присутствует, если в запросе передавалась сумма для печати в чеке.
+ *
+ * @var AmountInterface|null
+ */
+ private $_amount;
+
+
+ /**
+ * Возвращает service_name.
+ *
+ * @return string
+ */
+ public function getServiceName()
+ {
+ return $this->_service_name;
+ }
+
+ /**
+ * Устанавливает service_name.
+ *
+ * @param string $value Описание услуги, оказанной получателем выплаты. Не более 50 символов.
+ *
+ * @return $this
+ */
+ public function setServiceName($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException('Empty service_name value', 0, 'IncomeReceipt.service_name');
+ }
+ if (!TypeCast::canCastToString($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid service_name value type',
+ 0,
+ 'IncomeReceipt.service_name',
+ $value
+ );
+ }
+ if (mb_strlen($value, 'utf-8') > self::MAX_LENGTH_SERVICE_NAME) {
+ throw new InvalidPropertyValueException('Invalid IncomeReceipt service_name value', 0, 'IncomeReceipt.service_name', $value);
+ }
+ $this->_service_name = (string)$value;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает npd_receipt_id.
+ *
+ * @return string|null
+ */
+ public function getNpdReceiptId()
+ {
+ return $this->_npd_receipt_id;
+ }
+
+ /**
+ * Устанавливает npd_receipt_id.
+ *
+ * @param string|null $value Идентификатор чека в сервисе.
+ *
+ * Пример: ~`208jd98zqe`
+ *
+ * @return $this
+ */
+ public function setNpdReceiptId($value = null)
+ {
+ if ($value === null || $value === '') {
+ $this->_npd_receipt_id = null;
+ } elseif (TypeCast::canCastToString($value)) {
+ $this->_npd_receipt_id = (string)$value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid npd_receipt_id value type',
+ 0,
+ 'IncomeReceipt.npd_receipt_id',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает Ссылка на зарегистрированный чек.
+ *
+ * @return string|null
+ */
+ public function getUrl()
+ {
+ return $this->_url;
+ }
+
+ /**
+ * Устанавливает ссылка на зарегистрированный чек.
+ *
+ * @param string|null $value Ссылка на зарегистрированный чек
+ *
+ * Пример: ~`https://www.nalog.gov.ru/api/v1/receipt/<Идентификатор чека>/print`
+ *
+ * @return $this
+ */
+ public function setUrl($value = null)
+ {
+ if ($value === null || $value === '') {
+ $this->_url = null;
+ } elseif (TypeCast::canCastToString($value)) {
+ $this->_url = (string)$value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid url value type',
+ 0,
+ 'IncomeReceipt.url',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает amount.
+ *
+ * @return AmountInterface|null
+ */
+ public function getAmount()
+ {
+ return $this->_amount;
+ }
+
+ /**
+ * Устанавливает amount.
+ *
+ * @param AmountInterface|array|null $value
+ *
+ * @return $this
+ */
+ public function setAmount($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_amount = null;
+ } elseif ($value instanceof AmountInterface) {
+ $this->_amount = $value;
+ } elseif (is_array($value)) {
+ $this->_amount = new MonetaryAmount($value);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid IncomeReceipt.amount value type',
+ 0,
+ 'IncomeReceipt.amount',
+ $value
+ );
+ }
+
+ return $this;
+ }
+}
diff --git a/lib/Model/Payout/PayoutCancellationDetails.php b/lib/Model/Payout/PayoutCancellationDetails.php
index 68ebf281..76a46d2a 100644
--- a/lib/Model/Payout/PayoutCancellationDetails.php
+++ b/lib/Model/Payout/PayoutCancellationDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Payout/PayoutCancellationDetailsPartyCode.php b/lib/Model/Payout/PayoutCancellationDetailsPartyCode.php
index 7656bbef..86334d1a 100644
--- a/lib/Model/Payout/PayoutCancellationDetailsPartyCode.php
+++ b/lib/Model/Payout/PayoutCancellationDetailsPartyCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -35,20 +35,14 @@ class PayoutCancellationDetailsPartyCode extends AbstractEnum
{
/**
* Платформа (вы)
+ * @deprecated Будет удален в будущих версиях
*/
const MERCHANT = 'merchant';
-
- /**
- * ЮKassa
- */
+ /** ЮKassa */
const YOO_KASSA = 'yoo_kassa';
-
- /**
- * «Внешние» участники процесса выплаты (например, эмитент, сторонний платежный сервис)
- */
+ /** «Внешние» участники процесса выплаты (например, эмитент, сторонний платежный сервис) */
const PAYMENT_NETWORK = 'payment_network';
-
protected static $validValues = array(
self::MERCHANT => true,
self::YOO_KASSA => true,
diff --git a/lib/Model/Payout/PayoutCancellationDetailsReasonCode.php b/lib/Model/Payout/PayoutCancellationDetailsReasonCode.php
index 77afdac8..f8d5e868 100644
--- a/lib/Model/Payout/PayoutCancellationDetailsReasonCode.php
+++ b/lib/Model/Payout/PayoutCancellationDetailsReasonCode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Payout/PayoutDestinationBankCard.php b/lib/Model/Payout/PayoutDestinationBankCard.php
index 29da9e93..963af1d1 100644
--- a/lib/Model/Payout/PayoutDestinationBankCard.php
+++ b/lib/Model/Payout/PayoutDestinationBankCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class PayoutDestinationBankCard extends AbstractPayoutDestination
public function __construct()
{
- $this->_setType(PaymentMethodType::BANK_CARD);
+ $this->setType(PaymentMethodType::BANK_CARD);
}
/**
@@ -75,7 +75,10 @@ class PayoutDestinationBankCard extends AbstractPayoutDestination
$this->_card = $card;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card value type in PayoutDestinationBankCard', 0, 'PayoutDestinationBankCard.card', $value
+ 'Invalid card value type in PayoutDestinationBankCard',
+ 0,
+ 'PayoutDestinationBankCard.card',
+ $value
);
}
}
diff --git a/lib/Model/Payout/PayoutDestinationBankCardCard.php b/lib/Model/Payout/PayoutDestinationBankCardCard.php
index 3c34ae6c..86723e77 100644
--- a/lib/Model/Payout/PayoutDestinationBankCardCard.php
+++ b/lib/Model/Payout/PayoutDestinationBankCardCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ use YooKassa\Helpers\TypeCast;
class PayoutDestinationBankCardCard extends AbstractObject
{
/**
- * @var string Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
+ * @var int Длина кода страны по ISO 3166 https://www.iso.org/obp/ui/#iso:pub:PUB500001:en
*/
const ISO_3166_CODE_LENGTH = 2;
@@ -98,12 +98,18 @@ class PayoutDestinationBankCardCard extends AbstractObject
$this->_last4 = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card last4 value', 0, 'PaymentMethodBankCard.last4', $value
+ 'Invalid card last4 value',
+ 0,
+ 'PaymentMethodBankCard.last4',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card last4 value type', 0, 'PaymentMethodBankCard.last4', $value
+ 'Invalid card last4 value type',
+ 0,
+ 'PaymentMethodBankCard.last4',
+ $value
);
}
}
@@ -132,12 +138,18 @@ class PayoutDestinationBankCardCard extends AbstractObject
$this->_first6 = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card first6 value', 0, 'PaymentMethodBankCard.first6', $value
+ 'Invalid card first6 value',
+ 0,
+ 'PaymentMethodBankCard.first6',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card first6 value type', 0, 'PaymentMethodBankCard.first6', $value
+ 'Invalid card first6 value type',
+ 0,
+ 'PaymentMethodBankCard.first6',
+ $value
);
}
}
@@ -163,7 +175,10 @@ class PayoutDestinationBankCardCard extends AbstractObject
$this->_cardType = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid cardType value type', 0, 'PaymentMethodBankCard.cardType', $value
+ 'Invalid cardType value type',
+ 0,
+ 'PaymentMethodBankCard.cardType',
+ $value
);
}
}
@@ -187,11 +202,17 @@ class PayoutDestinationBankCardCard extends AbstractObject
$this->_issuerCountry = (string)$value;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid issuerCountry value type', 0, 'PaymentMethodBankCard.issuerCountry', $value
+ 'Invalid issuerCountry value type',
+ 0,
+ 'PaymentMethodBankCard.issuerCountry',
+ $value
);
} elseif (mb_strlen($value) !== self::ISO_3166_CODE_LENGTH) {
throw new InvalidPropertyValueException(
- 'Invalid issuerCountry value', 0, 'PaymentMethodBankCard.issuerCountry', $value
+ 'Invalid issuerCountry value',
+ 0,
+ 'PaymentMethodBankCard.issuerCountry',
+ $value
);
}
@@ -208,7 +229,9 @@ class PayoutDestinationBankCardCard extends AbstractObject
$this->_issuerName = (string)$value;
} elseif (!TypeCast::canCastToString($value)) {
throw new EmptyPropertyValueException(
- 'Empty issuerName value', 0, 'PaymentMethodBankCard.issuerName'
+ 'Empty issuerName value',
+ 0,
+ 'PaymentMethodBankCard.issuerName'
);
}
@@ -223,5 +246,4 @@ class PayoutDestinationBankCardCard extends AbstractObject
{
return $this->_issuerName;
}
-
}
diff --git a/lib/Model/Payout/PayoutDestinationFactory.php b/lib/Model/Payout/PayoutDestinationFactory.php
index 567bff52..f271de50 100644
--- a/lib/Model/Payout/PayoutDestinationFactory.php
+++ b/lib/Model/Payout/PayoutDestinationFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,7 @@ class PayoutDestinationFactory
private $typeClassMap = array(
PaymentMethodType::YOO_MONEY => 'PayoutDestinationYooMoney',
PaymentMethodType::BANK_CARD => 'PayoutDestinationBankCard',
+ PaymentMethodType::SBP => 'PayoutDestinationSbp',
);
/**
@@ -52,9 +53,9 @@ class PayoutDestinationFactory
throw new \InvalidArgumentException('Invalid payment type value in payment factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid payment data type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid payment data type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
diff --git a/lib/Model/Payout/PayoutDestinationSbp.php b/lib/Model/Payout/PayoutDestinationSbp.php
new file mode 100644
index 00000000..c29c8ed1
--- /dev/null
+++ b/lib/Model/Payout/PayoutDestinationSbp.php
@@ -0,0 +1,177 @@
+setType(PaymentMethodType::SBP);
+ }
+
+ /**
+ * Возвращает телефон, к которому привязан счет получателя выплаты в системе участника СБП.
+ *
+ * @return string Телефон, к которому привязан счет получателя выплаты в системе участника СБП
+ */
+ public function getPhone()
+ {
+ return $this->_phone;
+ }
+
+ /**
+ * Устанавливает телефон, к которому привязан счет получателя выплаты в системе участника СБП.
+ *
+ * @param string $phone Телефон, к которому привязан счет получателя выплаты в системе участника СБП
+ *
+ * @return $this
+ */
+ public function setPhone($phone)
+ {
+ if ($phone === null || $phone === '') {
+ throw new EmptyPropertyValueException('Empty phone value', 0, 'PayoutDestinationSbp.phone');
+ }
+ if (!TypeCast::canCastToString($phone)) {
+ throw new InvalidPropertyValueTypeException('Invalid phone value type', 0, 'PayoutDestinationSbp.phone');
+ }
+ $this->_phone = (string)preg_replace('/\D/', '', $phone);
+
+ return $this;
+ }
+
+ /**
+ * Возвращает идентификатор выбранного участника СБП.
+ *
+ * @return string Идентификатор выбранного участника СБП
+ */
+ public function getBankId()
+ {
+ return $this->_bank_id;
+ }
+
+ /**
+ * Устанавливает идентификатор выбранного участника СБП.
+ *
+ * @param string $bankId Идентификатор выбранного участника СБП
+ *
+ * @return $this
+ */
+ public function setBankId($bankId)
+ {
+ if ($bankId === null || $bankId === '') {
+ throw new EmptyPropertyValueException('Empty bank_id value', 0, 'PayoutDestinationSbp.bank_id');
+ }
+ if (!TypeCast::canCastToString($bankId)) {
+ throw new InvalidPropertyValueTypeException('Invalid bank_id value type', 0, 'PayoutDestinationSbp.bank_id', $bankId);
+ }
+ if (mb_strlen($bankId) > 12) {
+ throw new InvalidPropertyValueException('Invalid bank_id value', 0, 'PayoutDestinationSbp.bank_id', $bankId);
+ }
+ $this->_bank_id = (string)$bankId;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает признак тестовой операции
+ * @return bool Признак тестовой операции
+ */
+ public function getRecipientChecked()
+ {
+ return $this->_recipient_checked;
+ }
+
+ /**
+ * Устанавливает признак тестовой операции
+ * @param bool $value Признак тестовой операции
+ */
+ public function setRecipientChecked($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException(
+ 'Empty PayoutDestinationSbp recipient_checked flag value',
+ 0,
+ 'PayoutDestinationSbp.recipient_checked'
+ );
+ }
+ if (!TypeCast::canCastToBoolean($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid PayoutDestinationSbp recipient_checked flag value type',
+ 0,
+ 'PayoutDestinationSbp.recipient_checked',
+ $value
+ );
+ }
+
+ $this->_recipient_checked = (bool)$value;
+
+ return $this;
+ }
+}
diff --git a/lib/Model/Payout/PayoutDestinationType.php b/lib/Model/Payout/PayoutDestinationType.php
index 3c03cb22..c09078dd 100644
--- a/lib/Model/Payout/PayoutDestinationType.php
+++ b/lib/Model/Payout/PayoutDestinationType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -31,15 +31,17 @@ use YooKassa\Model\PaymentMethodType;
/**
* PayoutDestinationType - Виды выплат
- * |Код|Описание|
- * --- | ---
- * |yoo_money|Выплата в кошелек ЮMoney|
- * |bank_card|Выплата на произвольную банковскую карту|
+ *
+ * Возможные значения:
+ * - `yoo_money` - Выплата в кошелек ЮMoney
+ * - `bank_card` - Выплата на произвольную банковскую карту
+ * - `sbp` - Выплата через СБП на счет в банке или платежном сервисе
*/
class PayoutDestinationType extends AbstractEnum
{
protected static $validValues = array(
PaymentMethodType::YOO_MONEY => true,
PaymentMethodType::BANK_CARD => true,
+ PaymentMethodType::SBP => true,
);
}
diff --git a/lib/Model/Payout/PayoutDestinationYooMoney.php b/lib/Model/Payout/PayoutDestinationYooMoney.php
index 34a2fc98..976f1514 100644
--- a/lib/Model/Payout/PayoutDestinationYooMoney.php
+++ b/lib/Model/Payout/PayoutDestinationYooMoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,7 @@ class PayoutDestinationYooMoney extends AbstractPayoutDestination
public function __construct()
{
- $this->_setType(PaymentMethodType::YOO_MONEY);
+ $this->setType(PaymentMethodType::YOO_MONEY);
}
/**
@@ -68,19 +68,27 @@ class PayoutDestinationYooMoney extends AbstractPayoutDestination
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty accountNumber value', 0, 'PayoutDestinationYooMoney.accountNumber'
+ 'Empty accountNumber value',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber'
);
} elseif (TypeCast::canCastToString($value)) {
if (preg_match('/^[0-9]{11,33}$/', $value)) {
$this->_accountNumber = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid accountNumber value', 0, 'PayoutDestinationYooMoney.accountNumber', $value
+ 'Invalid accountNumber value',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid accountNumber value type', 0, 'PayoutDestinationYooMoney.accountNumber', $value
+ 'Invalid accountNumber value type',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber',
+ $value
);
}
}
diff --git a/lib/Model/Payout/PayoutSelfEmployed.php b/lib/Model/Payout/PayoutSelfEmployed.php
new file mode 100644
index 00000000..64c08c73
--- /dev/null
+++ b/lib/Model/Payout/PayoutSelfEmployed.php
@@ -0,0 +1,80 @@
+_id;
+ }
+
+ /**
+ * Устанавливает идентификатор самозанятого в ЮKassa.
+ *
+ * @param string $id Идентификатор самозанятого в ЮKassa.
+ *
+ * @return $this
+ */
+ public function setId($id)
+ {
+ if (!TypeCast::canCastToString($id)) {
+ throw new InvalidPropertyValueTypeException('Invalid PayoutSelfEmployed id value type', 0, 'PayoutSelfEmployed.id', $id);
+ }
+ $length = mb_strlen($id, 'utf-8');
+ if ($length < SelfEmployedInterface::MIN_LENGTH_ID || $length > SelfEmployedInterface::MAX_LENGTH_ID) {
+ throw new InvalidPropertyValueException('Invalid PayoutSelfEmployed id value', 0, 'PayoutSelfEmployed.id', $id);
+ }
+ $this->_id = (string)$id;
+
+ return $this;
+ }
+}
diff --git a/lib/Model/Payout/SbpParticipantBank.php b/lib/Model/Payout/SbpParticipantBank.php
new file mode 100644
index 00000000..653e0928
--- /dev/null
+++ b/lib/Model/Payout/SbpParticipantBank.php
@@ -0,0 +1,135 @@
+_bank_id;
+ }
+
+ /**
+ * Устанавливает bank_id.
+ *
+ * @param string $bank_id Идентификатор банка или платежного сервиса в СБП.
+ *
+ * @return $this
+ */
+ public function setBankId($bank_id)
+ {
+ $this->_bank_id = $bank_id;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает name.
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->_name;
+ }
+
+ /**
+ * Устанавливает name.
+ *
+ * @param string $name Название банка или платежного сервиса в СБП.
+ *
+ * @return $this
+ */
+ public function setName($name)
+ {
+ $this->_name = $name;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает bic.
+ *
+ * @return string
+ */
+ public function getBic()
+ {
+ return $this->_bic;
+ }
+
+ /**
+ * Устанавливает bic.
+ *
+ * @param string $bic Банковский идентификационный код (БИК) банка или платежного сервиса.
+ *
+ * @return $this
+ */
+ public function setBic($bic)
+ {
+ $this->_bic = $bic;
+
+ return $this;
+ }
+}
diff --git a/lib/Model/PayoutInterface.php b/lib/Model/PayoutInterface.php
index 5fb2ecf7..e1d7b22f 100644
--- a/lib/Model/PayoutInterface.php
+++ b/lib/Model/PayoutInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/PayoutStatus.php b/lib/Model/PayoutStatus.php
index 69847190..1208f503 100644
--- a/lib/Model/PayoutStatus.php
+++ b/lib/Model/PayoutStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,11 @@ use YooKassa\Common\AbstractEnum;
/**
* PayoutStatus - Статус выплаты
- * |Код|Описание|
- * --- | ---
- * |pending|Выплата создана и ожидает подтверждения от эмитента|
- * |succeeded|Выплата успешно завершена|
- * |canceled|Выплата отменена|
*
+ * Возможные значения:
+ * - `pending` - Выплата создана и ожидает подтверждения от эмитента
+ * - `succeeded` - Выплата успешно завершена
+ * - `canceled` - Выплата отменена
*/
class PayoutStatus extends AbstractEnum
{
diff --git a/lib/Model/PersonalData/PersonalData.php b/lib/Model/PersonalData/PersonalData.php
new file mode 100644
index 00000000..1a70ee34
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalData.php
@@ -0,0 +1,360 @@
+_id;
+ }
+
+ /**
+ * Устанавливает id.
+ *
+ * @param string $id Идентификатор персональных данных, сохраненных в ЮKassa.
+ *
+ * @return $this
+ */
+ public function setId($id)
+ {
+ if (!TypeCast::canCastToString($id)) {
+ throw new InvalidPropertyValueTypeException('Invalid PersonalData id value type', 0, 'PersonalData.id', $id);
+ }
+ $length = mb_strlen($id, 'utf-8');
+ if ($length < PersonalDataInterface::MIN_LENGTH_ID || $length > PersonalDataInterface::MAX_LENGTH_ID) {
+ throw new InvalidPropertyValueException('Invalid PersonalData id value', 0, 'PersonalData.id', $id);
+ }
+ $this->_id = (string)$id;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает тип персональных данных.
+ *
+ * @return string Тип персональных данных
+ */
+ public function getType()
+ {
+ return $this->_type;
+ }
+
+ /**
+ * Устанавливает тип персональных данных.
+ *
+ * @param string $type Тип персональных данных
+ *
+ * @return $this
+ */
+ public function setType($type)
+ {
+ if (!TypeCast::canCastToEnumString($type)) {
+ throw new InvalidPropertyValueTypeException('Invalid PersonalData type value type', 0, 'PersonalData.type', $type);
+ }
+ if (!PersonalDataType::valueExists((string)$type)) {
+ throw new InvalidPropertyValueException('Invalid PersonalData type value', 0, 'PersonalData.type', $type);
+ }
+ $this->_type = (string)$type;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает статус персональных данных.
+ *
+ * @return string Статус персональных данных
+ */
+ public function getStatus()
+ {
+ return $this->_status;
+ }
+
+ /**
+ * Устанавливает статус персональных данных.
+ *
+ * @param string $status Статус персональных данных
+ *
+ * @return $this
+ */
+ public function setStatus($status)
+ {
+ if (!TypeCast::canCastToEnumString($status)) {
+ throw new InvalidPropertyValueTypeException('Invalid PersonalData status value type', 0, 'PersonalData.status', $status);
+ }
+ if (!PersonalDataStatus::valueExists((string)$status)) {
+ throw new InvalidPropertyValueException('Invalid PersonalData status value', 0, 'PersonalData.status', $status);
+ }
+ $this->_status = (string)$status;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает cancellation_details.
+ *
+ * @return PersonalDataCancellationDetails|null
+ */
+ public function getCancellationDetails()
+ {
+ return $this->_cancellation_details;
+ }
+
+ /**
+ * Устанавливает cancellation_details.
+ *
+ * @param PersonalDataCancellationDetails|array|null $cancellation_details
+ *
+ * @return $this
+ */
+ public function setCancellationDetails($cancellation_details)
+ {
+ if ($cancellation_details === null) {
+ $this->_cancellation_details = null;
+ } elseif (is_array($cancellation_details)) {
+ $this->_cancellation_details = new PersonalDataCancellationDetails($cancellation_details);
+ } elseif ($cancellation_details instanceof PersonalDataCancellationDetails) {
+ $this->_cancellation_details = $cancellation_details;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "cancellation_details" parameter in PersonalData',
+ 0,
+ 'PersonalData.cancellation_details',
+ $cancellation_details
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает created_at.
+ *
+ * @return DateTime
+ */
+ public function getCreatedAt()
+ {
+ return $this->_created_at;
+ }
+
+ /**
+ * Устанавливает время создания персональных данных.
+ *
+ * @param DateTime|string|int $created_at Время создания персональных данных
+ *
+ * @return $this
+ * @throws Exception
+ */
+ public function setCreatedAt($created_at)
+ {
+ if ($created_at === null || $created_at === '') {
+ throw new EmptyPropertyValueException('Empty created_at value', 0, 'PersonalData.createdAt');
+ }
+ if (!TypeCast::canCastToDateTime($created_at)) {
+ throw new InvalidPropertyValueTypeException('Invalid created_at value', 0, 'PersonalData.createdAt', $created_at);
+ }
+ $dateTime = TypeCast::castToDateTime($created_at);
+ if ($dateTime === null) {
+ throw new InvalidPropertyValueException('Invalid created_at value', 0, 'PersonalData.createdAt', $created_at);
+ }
+ $this->_created_at = $dateTime;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает срок жизни объекта персональных данных.
+ *
+ * @return DateTime|null Срок жизни объекта персональных данных
+ */
+ public function getExpiresAt()
+ {
+ return $this->_expires_at;
+ }
+
+ /**
+ * Устанавливает срок жизни объекта персональных данных.
+ *
+ * @param DateTime|string|int|null $expires_at Срок жизни объекта персональных данных
+ *
+ * @return $this
+ * @throws Exception
+ */
+ public function setExpiresAt($expires_at = null)
+ {
+ if ($expires_at === null || $expires_at === '') {
+ $this->_expires_at = null;
+ } elseif (TypeCast::canCastToDateTime($expires_at)) {
+ $dateTime = TypeCast::castToDateTime($expires_at);
+ if ($dateTime === null) {
+ throw new InvalidPropertyValueException('Invalid expires_at value', 0, 'PersonalData.expiresAt', $expires_at);
+ }
+ $this->_expires_at = $dateTime;
+ } else {
+ throw new InvalidPropertyValueTypeException('Invalid expires_at value', 0, 'PersonalData.expiresAt', $expires_at);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает любые дополнительные данные.
+ *
+ * @return array|null Любые дополнительные данные
+ */
+ public function getMetadata()
+ {
+ return $this->_metadata;
+ }
+
+ /**
+ * Устанавливает любые дополнительные данные.
+ *
+ * @param Metadata|array|null $metadata Любые дополнительные данные
+ *
+ * @return $this
+ */
+ public function setMetadata($metadata = null)
+ {
+ if ($metadata === null || $metadata === '') {
+ $this->_metadata = null;
+ } elseif (is_array($metadata)) {
+ $this->_metadata = new Metadata($metadata);
+ } elseif ($metadata instanceof Metadata) {
+ $this->_metadata = $metadata;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid metadata type for "metadata" parameter in PersonalData',
+ 0,
+ 'PersonalData.metadata',
+ $metadata
+ );
+ }
+
+ return $this;
+ }
+}
diff --git a/lib/Model/PersonalData/PersonalDataCancellationDetails.php b/lib/Model/PersonalData/PersonalDataCancellationDetails.php
new file mode 100644
index 00000000..c2c988a8
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalDataCancellationDetails.php
@@ -0,0 +1,125 @@
+_party;
+ }
+
+ /**
+ * Устанавливает участника процесса, который принял решение о прекращении хранения персональных данных.
+ *
+ * @param string $value Участник процесса, который принял решение о прекращении хранения персональных данных
+ *
+ * @return self
+ */
+ public function setParty($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException('Empty party value', 0, 'PersonalDataCancellationDetails.party');
+ }
+ if (!TypeCast::canCastToString($value)) {
+ throw new InvalidPropertyValueTypeException('Invalid party value type', 0, 'PersonalDataCancellationDetails.party', $value);
+ }
+ $this->_party = strtolower((string)$value);
+
+ return $this;
+ }
+
+ /**
+ * Возвращает reason.
+ *
+ * @return string
+ */
+ public function getReason()
+ {
+ return $this->_reason;
+ }
+
+ /**
+ * Устанавливает причину прекращения хранения персональных данных.
+ *
+ * @param string $value Причина прекращения хранения персональных данных
+ *
+ * @return self
+ */
+ public function setReason($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException('Empty reason value', 0, 'PersonalDataCancellationDetails.reason');
+ }
+ if (!TypeCast::canCastToString($value)) {
+ throw new InvalidPropertyValueTypeException('Invalid reason value type', 0, 'PersonalDataCancellationDetails.reason');
+ }
+ $this->_reason = strtolower((string)$value);
+
+ return $this;
+ }
+}
diff --git a/lib/Model/PersonalData/PersonalDataCancellationDetailsPartyCode.php b/lib/Model/PersonalData/PersonalDataCancellationDetailsPartyCode.php
new file mode 100644
index 00000000..564cac5e
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalDataCancellationDetailsPartyCode.php
@@ -0,0 +1,42 @@
+ true,
+ );
+}
diff --git a/lib/Model/PersonalData/PersonalDataCancellationDetailsReasonCode.php b/lib/Model/PersonalData/PersonalDataCancellationDetailsReasonCode.php
new file mode 100644
index 00000000..cf9e5708
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalDataCancellationDetailsReasonCode.php
@@ -0,0 +1,42 @@
+ true,
+ );
+}
diff --git a/lib/Model/PersonalData/PersonalDataInterface.php b/lib/Model/PersonalData/PersonalDataInterface.php
new file mode 100644
index 00000000..36873027
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalDataInterface.php
@@ -0,0 +1,158 @@
+ true,
+ self::ACTIVE => true,
+ self::CANCELED => true,
+ );
+}
diff --git a/lib/Model/PersonalData/PersonalDataType.php b/lib/Model/PersonalData/PersonalDataType.php
new file mode 100644
index 00000000..e1a3f3cd
--- /dev/null
+++ b/lib/Model/PersonalData/PersonalDataType.php
@@ -0,0 +1,53 @@
+ true,
+ );
+}
diff --git a/lib/Model/Receipt.php b/lib/Model/Receipt.php
index f09be79a..e76d7f4f 100644
--- a/lib/Model/Receipt.php
+++ b/lib/Model/Receipt.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -141,7 +141,10 @@ class Receipt extends AbstractObject implements ReceiptInterface
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid items value type in receipt', 0, 'receipt.items', $value
+ 'Invalid items value type in receipt',
+ 0,
+ 'receipt.items',
+ $value
);
}
$this->_items = array();
@@ -151,7 +154,10 @@ class Receipt extends AbstractObject implements ReceiptInterface
$this->addItem($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid item value type in receipt', 0, 'receipt.items['.$key.']', $val
+ 'Invalid item value type in receipt',
+ 0,
+ 'receipt.items[' . $key . ']',
+ $val
);
}
}
@@ -192,7 +198,10 @@ class Receipt extends AbstractObject implements ReceiptInterface
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in receipt', 0, 'receipt.settlements', $value
+ 'Invalid settlements value type in receipt',
+ 0,
+ 'receipt.settlements',
+ $value
);
}
$this->_settlements = array();
@@ -203,7 +212,10 @@ class Receipt extends AbstractObject implements ReceiptInterface
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in receipt', 0, 'receipt.settlements['.$key.']', $val
+ 'Invalid settlements value type in receipt',
+ 0,
+ 'receipt.settlements[' . $key . ']',
+ $val
);
}
}
@@ -279,7 +291,10 @@ class Receipt extends AbstractObject implements ReceiptInterface
$this->_additionalUserProps = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid additionalUserProps value type in receipt', 0, 'Receipt.additional_user_props', $value
+ 'Invalid additionalUserProps value type in receipt',
+ 0,
+ 'Receipt.additional_user_props',
+ $value
);
}
}
@@ -601,5 +616,4 @@ class Receipt extends AbstractObject implements ReceiptInterface
{
return null;
}
-
}
diff --git a/lib/Model/Receipt/AdditionalUserProps.php b/lib/Model/Receipt/AdditionalUserProps.php
index 5ec5482a..0bbef5e5 100644
--- a/lib/Model/Receipt/AdditionalUserProps.php
+++ b/lib/Model/Receipt/AdditionalUserProps.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Receipt/AgentType.php b/lib/Model/Receipt/AgentType.php
index 580c9d98..496a2d32 100644
--- a/lib/Model/Receipt/AgentType.php
+++ b/lib/Model/Receipt/AgentType.php
@@ -1,19 +1,64 @@
true,
self::AGENT => true,
);
-}
\ No newline at end of file
+}
diff --git a/lib/Model/Receipt/IndustryDetails.php b/lib/Model/Receipt/IndustryDetails.php
index efa42393..441ef6e3 100644
--- a/lib/Model/Receipt/IndustryDetails.php
+++ b/lib/Model/Receipt/IndustryDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Receipt/MarkCodeInfo.php b/lib/Model/Receipt/MarkCodeInfo.php
index 25c2e7ea..8faf1fdc 100644
--- a/lib/Model/Receipt/MarkCodeInfo.php
+++ b/lib/Model/Receipt/MarkCodeInfo.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Receipt/MarkQuantity.php b/lib/Model/Receipt/MarkQuantity.php
index cbb949cf..30efa576 100644
--- a/lib/Model/Receipt/MarkQuantity.php
+++ b/lib/Model/Receipt/MarkQuantity.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Receipt/OperationalDetails.php b/lib/Model/Receipt/OperationalDetails.php
index 9309cd22..20356326 100644
--- a/lib/Model/Receipt/OperationalDetails.php
+++ b/lib/Model/Receipt/OperationalDetails.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Receipt/PaymentMode.php b/lib/Model/Receipt/PaymentMode.php
index 9f42c3a2..36f2d3ea 100644
--- a/lib/Model/Receipt/PaymentMode.php
+++ b/lib/Model/Receipt/PaymentMode.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,19 +33,19 @@ use YooKassa\Common\AbstractEnum;
*/
class PaymentMode extends AbstractEnum
{
- /** @var string Полная предоплата */
+ /** Полная предоплата */
const FULL_PREPAYMENT = 'full_prepayment';
- /** @var string Частичная предоплата */
+ /** Частичная предоплата */
const PARTIAL_PREPAYMENT = 'partial_prepayment';
- /** @var string Аванс */
+ /** Аванс */
const ADVANCE = 'advance';
- /** @var string Полный расчет */
+ /** Полный расчет */
const FULL_PAYMENT = 'full_payment';
- /** @var string Частичный расчет и кредит */
+ /** Частичный расчет и кредит */
const PARTIAL_PAYMENT = 'partial_payment';
- /** @var string Кредит */
+ /** Кредит */
const CREDIT = 'credit';
- /** @var string Выплата по кредиту */
+ /** Выплата по кредиту */
const CREDIT_PAYMENT = 'credit_payment';
protected static $validValues = array(
diff --git a/lib/Model/Receipt/PaymentSubject.php b/lib/Model/Receipt/PaymentSubject.php
index e8069c1e..9add6348 100644
--- a/lib/Model/Receipt/PaymentSubject.php
+++ b/lib/Model/Receipt/PaymentSubject.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,72 +33,72 @@ use YooKassa\Common\AbstractEnum;
*/
class PaymentSubject extends AbstractEnum
{
- /** @var string Товар */
+ /** Товар */
const COMMODITY = 'commodity';
- /** @var string Подакцизный товар */
+ /** Подакцизный товар */
const EXCISE = 'excise';
- /** @var string Работа */
+ /** Работа */
const JOB = 'job';
- /** @var string Услуга */
+ /** Услуга */
const SERVICE = 'service';
- /** @var string Ставка в азартной игре */
+ /** Ставка в азартной игре */
const GAMBLING_BET = 'gambling_bet';
- /** @var string Выигрыш азартной игры */
+ /** Выигрыш азартной игры */
const GAMBLING_PRIZE = 'gambling_prize';
- /** @var string Лотерейный билет */
+ /** Лотерейный билет */
const LOTTERY = 'lottery';
- /** @var string Выигрыш в лотерею */
+ /** Выигрыш в лотерею */
const LOTTERY_PRIZE = 'lottery_prize';
- /** @var string Результаты интеллектуальной деятельности */
+ /** Результаты интеллектуальной деятельности */
const INTELLECTUAL_ACTIVITY = 'intellectual_activity';
- /** @var string Платеж */
+ /** Платеж */
const PAYMENT = 'payment';
- /** @var string Агентское вознаграждение */
+ /** Агентское вознаграждение */
const AGENT_COMMISSION = 'agent_commission';
- /** @var string Имущественное право */
+ /** Имущественное право */
const PROPERTY_RIGHT = 'property_right';
- /** @var string Внереализационный доход */
+ /** Внереализационный доход */
const NON_OPERATING_GAIN = 'non_operating_gain';
- /** @var string Страховой сбор */
+ /** Страховой сбор */
const INSURANCE_PREMIUM = 'insurance_premium';
- /** @var string Торговый сбор */
+ /** Торговый сбор */
const SALES_TAX = 'sales_tax';
- /** @var string Курортный сбор */
+ /** Курортный сбор */
const RESORT_FEE = 'resort_fee';
- /** @var string Несколько вариантов */
+ /** Несколько вариантов */
const COMPOSITE = 'composite';
- /** @var string Другое */
+ /** Другое */
const ANOTHER = 'another';
- /** @var string Выплата */
+ /** Выплата */
const FINE = 'fine';
- /** @var string Страховые взносы */
+ /** Страховые взносы */
const TAX = 'tax';
- /** @var string Залог */
+ /** Залог */
const LIEN = 'lien';
- /** @var string Расход */
+ /** Расход */
const COST = 'cost';
- /** @var string Взносы на обязательное пенсионное страхование ИП */
+ /** Взносы на обязательное пенсионное страхование ИП */
const PENSION_INSURANCE_WITHOUT_PAYOUTS = 'pension_insurance_without_payouts';
- /** @var string Взносы на обязательное пенсионное страхование */
+ /** Взносы на обязательное пенсионное страхование */
const PENSION_INSURANCE_WITH_PAYOUTS = 'pension_insurance_with_payouts';
- /** @var string Взносы на обязательное медицинское страхование ИП */
+ /** Взносы на обязательное медицинское страхование ИП */
const HEALTH_INSURANCE_WITHOUT_PAYOUTS = 'health_insurance_without_payouts';
- /** @var string Взносы на обязательное медицинское страхование */
+ /** Взносы на обязательное медицинское страхование */
const HEALTH_INSURANCE_WITH_PAYOUTS = 'health_insurance_with_payouts';
- /** @var string Взносы на обязательное социальное страхование */
+ /** Взносы на обязательное социальное страхование */
const HEALTH_INSURANCE = 'health_insurance';
- /** @var string Платеж казино */
+ /** Платеж казино */
const CASINO = 'casino';
- /** @var string Выдача денежных средств */
+ /** Выдача денежных средств */
const AGENT_WITHDRAWALS = 'agent_withdrawals';
- /** @var string Подакцизный товар, подлежащий маркировке средством идентификации, не имеющим кода маркировки (в чеке — АТНМ). Пример: алкогольная продукция */
+ /** Подакцизный товар, подлежащий маркировке средством идентификации, не имеющим кода маркировки (в чеке — АТНМ). Пример: алкогольная продукция */
const NON_MARKED_EXCISE = 'non_marked_excise';
- /** @var string Подакцизный товар, подлежащий маркировке средством идентификации, имеющим код маркировки (в чеке — АТМ). Пример: табак */
+ /** Подакцизный товар, подлежащий маркировке средством идентификации, имеющим код маркировки (в чеке — АТМ). Пример: табак */
const MARKED_EXCISE = 'marked_excise';
- /** @var string Товар, подлежащий маркировке средством идентификации, имеющим код маркировки, за исключением подакцизного товара (в чеке — ТМ). Пример: обувь, духи, товары легкой промышленности */
+ /** Товар, подлежащий маркировке средством идентификации, имеющим код маркировки, за исключением подакцизного товара (в чеке — ТМ). Пример: обувь, духи, товары легкой промышленности */
const MARKED = 'marked';
- /** @var string Товар, подлежащий маркировке средством идентификации, не имеющим кода маркировки, за исключением подакцизного товара (в чеке — ТНМ). Пример: меховые изделия */
+ /** Товар, подлежащий маркировке средством идентификации, не имеющим кода маркировки, за исключением подакцизного товара (в чеке — ТНМ). Пример: меховые изделия */
const NON_MARKED = 'non_marked';
protected static $validValues = array(
diff --git a/lib/Model/Receipt/ReceiptItemAmount.php b/lib/Model/Receipt/ReceiptItemAmount.php
index e53e64af..d667a926 100644
--- a/lib/Model/Receipt/ReceiptItemAmount.php
+++ b/lib/Model/Receipt/ReceiptItemAmount.php
@@ -1,8 +1,9 @@
_value = $castedValue;
}
@@ -145,7 +145,10 @@ class ReceiptItemAmount extends AbstractObject implements AmountInterface
$this->_currency = $value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid currency value: "' . $value . '"', 0, 'amount.currency', $value
+ 'Invalid currency value: "' . $value . '"',
+ 0,
+ 'amount.currency',
+ $value
);
}
} else {
@@ -169,18 +172,27 @@ class ReceiptItemAmount extends AbstractObject implements AmountInterface
}
if (!is_numeric($coefficient)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid coefficient type in multiply method', 0, 'amount.value', $coefficient
+ 'Invalid coefficient type in multiply method',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
if ($coefficient <= 0.0) {
throw new InvalidPropertyValueException(
- 'Invalid coefficient in multiply method: "' . $coefficient . '"', 0, 'amount.value', $coefficient
+ 'Invalid coefficient in multiply method: "' . $coefficient . '"',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
$castedValue = (int)round($coefficient * $this->_value);
if ($castedValue === 0) {
throw new InvalidPropertyValueException(
- 'Invalid coefficient value in multiply method: "' . $coefficient . '"', 0, 'amount.value', $coefficient
+ 'Invalid coefficient value in multiply method: "' . $coefficient . '"',
+ 0,
+ 'amount.value',
+ $coefficient
);
}
$this->_value = $castedValue;
@@ -201,13 +213,19 @@ class ReceiptItemAmount extends AbstractObject implements AmountInterface
}
if (!is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid amount value type in increase method', 0, 'amount.value', $value
+ 'Invalid amount value type in increase method',
+ 0,
+ 'amount.value',
+ $value
);
}
$castedValue = (int)round($this->_value + $value * 100.0);
if ($castedValue <= 0) {
throw new InvalidPropertyValueException(
- 'Invalid amount value in increase method: "' . $value . '"', 0, 'amount.value', $value
+ 'Invalid amount value in increase method: "' . $value . '"',
+ 0,
+ 'amount.value',
+ $value
);
}
$this->_value = $castedValue;
diff --git a/lib/Model/Receipt/ReceiptItemMeasure.php b/lib/Model/Receipt/ReceiptItemMeasure.php
index 1e139087..b64f3e76 100644
--- a/lib/Model/Receipt/ReceiptItemMeasure.php
+++ b/lib/Model/Receipt/ReceiptItemMeasure.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -34,53 +34,53 @@ use YooKassa\Common\AbstractEnum;
*/
class ReceiptItemMeasure extends AbstractEnum
{
- /** @var string Штука, единица товара */
+ /** Штука, единица товара */
const PIECE = 'piece';
- /** @var string Грамм */
+ /** Грамм */
const GRAM = 'gram';
- /** @var string Килограмм */
+ /** Килограмм */
const KILOGRAM = 'kilogram';
- /** @var string Тонна */
+ /** Тонна */
const TON = 'ton';
- /** @var string Сантиметр */
+ /** Сантиметр */
const CENTIMETER = 'centimeter';
- /** @var string Дециметр */
+ /** Дециметр */
const DECIMETER = 'decimeter';
- /** @var string Метр */
+ /** Метр */
const METER = 'meter';
- /** @var string Квадратный сантиметр */
+ /** Квадратный сантиметр */
const SQUARE_CENTIMETER = 'square_centimeter';
- /** @var string Квадратный дециметр */
+ /** Квадратный дециметр */
const SQUARE_DECIMETER = 'square_decimeter';
- /** @var string Квадратный метр */
+ /** Квадратный метр */
const SQUARE_METER = 'square_meter';
- /** @var string Миллилитр */
+ /** Миллилитр */
const MILLILITER = 'milliliter';
- /** @var string Литр */
+ /** Литр */
const LITER = 'liter';
- /** @var string Кубический метр */
+ /** Кубический метр */
const CUBIC_METER = 'cubic_meter';
- /** @var string Килловат-час */
+ /** Килловат-час */
const KILOWATT_HOUR = 'kilowatt_hour';
- /** @var string Гигакалория */
+ /** Гигакалория */
const GIGACALORIE = 'gigacalorie';
- /** @var string Сутки */
+ /** Сутки */
const DAY = 'day';
- /** @var string Час */
+ /** Час */
const HOUR = 'hour';
- /** @var string Минута */
+ /** Минута */
const MINUTE = 'minute';
- /** @var string Секунда */
+ /** Секунда */
const SECOND = 'second';
- /** @var string Килобайт */
+ /** Килобайт */
const KILOBYTE = 'kilobyte';
- /** @var string Мегабайт */
+ /** Мегабайт */
const MEGABYTE = 'megabyte';
- /** @var string Гигабайт */
+ /** Гигабайт */
const GIGABYTE = 'gigabyte';
- /** @var string Терабайт */
+ /** Терабайт */
const TERABYTE = 'terabyte';
- /** @var string Другое */
+ /** Другое */
const ANOTHER = 'another';
protected static $validValues = array(
diff --git a/lib/Model/Receipt/SettlementType.php b/lib/Model/Receipt/SettlementType.php
index 1cdbd9f7..be61cfee 100644
--- a/lib/Model/Receipt/SettlementType.php
+++ b/lib/Model/Receipt/SettlementType.php
@@ -1,8 +1,9 @@
256) {
throw new InvalidPropertyValueException(
- 'Invalid full_name value: "'.$value.'"', 0, 'receipt.customer.full_name', $value
+ 'Invalid full_name value: "' . $value . '"',
+ 0,
+ 'receipt.customer.full_name',
+ $value
);
} else {
$this->_fullName = (string)$value;
@@ -172,7 +175,7 @@ class ReceiptCustomer extends AbstractObject implements ReceiptCustomerInterface
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException('Invalid inn value type', 0, 'receipt.customer.inn');
} elseif (!preg_match('/^([0-9]{10}|[0-9]{12})$/', (string)$value)) {
- throw new InvalidPropertyValueException('Invalid inn value: "'.$value.'"', 0, 'receipt.customer.inn');
+ throw new InvalidPropertyValueException('Invalid inn value: "' . $value . '"', 0, 'receipt.customer.inn');
} else {
$this->_inn = (string)$value;
}
@@ -214,5 +217,4 @@ class ReceiptCustomer extends AbstractObject implements ReceiptCustomerInterface
return $result;
}
-
}
diff --git a/lib/Model/ReceiptCustomerInterface.php b/lib/Model/ReceiptCustomerInterface.php
index 11bf6475..32def7a1 100644
--- a/lib/Model/ReceiptCustomerInterface.php
+++ b/lib/Model/ReceiptCustomerInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -44,33 +44,33 @@ interface ReceiptCustomerInterface
*
* @return string Название организации или ФИО физического лица
*/
- function getFullName();
+ public function getFullName();
/**
* Возвращает номер телефона плательщика в формате ITU-T E.164 на который будет выслан чек
*
* @return string Номер телефона плательщика
*/
- function getPhone();
+ public function getPhone();
/**
* Возвращает адрес электронной почты на который будет выслан чек
*
* @return string E-mail адрес плательщика
*/
- function getEmail();
+ public function getEmail();
/**
* Возвращает ИНН плательщика
*
* @return string ИНН плательщика
*/
- function getInn();
+ public function getInn();
/**
* Возвращает массив полей плательщика
*
* @return array
*/
- function jsonSerialize();
+ public function jsonSerialize();
}
diff --git a/lib/Model/ReceiptInterface.php b/lib/Model/ReceiptInterface.php
index cb34b0bc..a647934a 100644
--- a/lib/Model/ReceiptInterface.php
+++ b/lib/Model/ReceiptInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/ReceiptItem.php b/lib/Model/ReceiptItem.php
index 7063b8d0..c7cf38f4 100644
--- a/lib/Model/ReceiptItem.php
+++ b/lib/Model/ReceiptItem.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/ReceiptItemInterface.php b/lib/Model/ReceiptItemInterface.php
index 624a7542..da9717d0 100644
--- a/lib/Model/ReceiptItemInterface.php
+++ b/lib/Model/ReceiptItemInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/ReceiptRegistrationStatus.php b/lib/Model/ReceiptRegistrationStatus.php
index 155b09e3..012a876a 100644
--- a/lib/Model/ReceiptRegistrationStatus.php
+++ b/lib/Model/ReceiptRegistrationStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,27 +32,17 @@ use YooKassa\Common\AbstractEnum;
* Класс с перечислением статусов доставки данных для чека в онлайн-кассу (`pending`, `succeeded` или `canceled`)
*
* Состояние регистрации фискального чека:
- *
- *
pending - Чек ожидает доставки
- *
succeeded - Успешно доставлен
- *
canceled - Чек не доставлен
- *
+ * - `pending` - Чек ожидает доставки
+ * - `succeeded` - Успешно доставлен
+ * - `canceled` - Чек не доставлен
*/
class ReceiptRegistrationStatus extends AbstractEnum
{
- /**
- * @var string Состояние регистрации фискального чека: ожидает доставки
- */
+ /** Состояние регистрации фискального чека: ожидает доставки */
const PENDING = 'pending';
-
- /**
- * @var string Состояние регистрации фискального чека: успешно доставлен
- */
+ /** Состояние регистрации фискального чека: успешно доставлен */
const SUCCEEDED = 'succeeded';
-
- /**
- * @var string Состояние регистрации фискального чека: не доставлен
- */
+ /** Состояние регистрации фискального чека: не доставлен */
const CANCELED = 'canceled';
protected static $validValues = array(
diff --git a/lib/Model/ReceiptType.php b/lib/Model/ReceiptType.php
index 35766e4a..c719dd23 100644
--- a/lib/Model/ReceiptType.php
+++ b/lib/Model/ReceiptType.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,21 +30,19 @@ use YooKassa\Common\AbstractEnum;
/**
* ReceiptType - Тип чека в онлайн-кассе.
- * |Код|Описание|
- * --- | ---
- * |payment|Приход|
- * |refund|Возврат|
- * |simple|Простой|
+ *
+ * Возможные значения:
+ * - `payment` - Приход
+ * - `refund` - Возврат
+ * - `simple` - Простой
*/
class ReceiptType extends AbstractEnum
{
- /** @var string Тип чека: приход */
+ /** Тип чека: приход */
const PAYMENT = 'payment';
-
- /** @var string Тип чека: возврат */
+ /** Тип чека: возврат */
const REFUND = 'refund';
-
- /** @var string Тип чека: простой */
+ /** Тип чека: простой */
const SIMPLE = 'simple';
protected static $validValues = array(
diff --git a/lib/Model/Recipient.php b/lib/Model/Recipient.php
index 9af46d6c..b510706a 100644
--- a/lib/Model/Recipient.php
+++ b/lib/Model/Recipient.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -80,7 +80,10 @@ class Recipient extends AbstractObject implements RecipientInterface
$this->_accountId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid accountId value type in Recipient', 0, 'Recipient.accountId', $value
+ 'Invalid accountId value type in Recipient',
+ 0,
+ 'Recipient.accountId',
+ $value
);
}
}
@@ -109,13 +112,18 @@ class Recipient extends AbstractObject implements RecipientInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty gatewayId value in Recipient', 0, 'Recipient.gatewayId'
+ 'Empty gatewayId value in Recipient',
+ 0,
+ 'Recipient.gatewayId'
);
} elseif (TypeCast::canCastToString($value)) {
$this->_gatewayId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid gatewayId value type in Recipient', 0, 'Recipient.gatewayId', $value
+ 'Invalid gatewayId value type in Recipient',
+ 0,
+ 'Recipient.gatewayId',
+ $value
);
}
}
diff --git a/lib/Model/RecipientInterface.php b/lib/Model/RecipientInterface.php
index fbeb2fb7..f3fbccb8 100644
--- a/lib/Model/RecipientInterface.php
+++ b/lib/Model/RecipientInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -44,7 +44,7 @@ interface RecipientInterface
*
* @return string Идентификатор магазина
*/
- function getAccountId();
+ public function getAccountId();
/**
* Возвращает идентификатор шлюза.
@@ -53,5 +53,5 @@ interface RecipientInterface
*
* @return string Идентификатор шлюза
*/
- function getGatewayId();
+ public function getGatewayId();
}
diff --git a/lib/Model/Refund.php b/lib/Model/Refund.php
index afb64e18..305f5dc9 100644
--- a/lib/Model/Refund.php
+++ b/lib/Model/Refund.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -157,12 +157,18 @@ class Refund extends AbstractObject implements RefundInterface
$this->_paymentId = $castedValue;
} else {
throw new InvalidPropertyValueException(
- 'Invalid refund paymentId value', 0, 'Refund.paymentId', $value
+ 'Invalid refund paymentId value',
+ 0,
+ 'Refund.paymentId',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid refund paymentId value type', 0, 'Refund.paymentId', $value
+ 'Invalid refund paymentId value type',
+ 0,
+ 'Refund.paymentId',
+ $value
);
}
}
@@ -194,12 +200,18 @@ class Refund extends AbstractObject implements RefundInterface
$this->_status = $castedValue;
} else {
throw new InvalidPropertyValueException(
- 'Invalid refund status value', 0, 'Refund.status', $value
+ 'Invalid refund status value',
+ 0,
+ 'Refund.status',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid refund status value type', 0, 'Refund.status', $value
+ 'Invalid refund status value type',
+ 0,
+ 'Refund.status',
+ $value
);
}
}
@@ -287,12 +299,18 @@ class Refund extends AbstractObject implements RefundInterface
$this->_receiptRegistration = $castedValue;
} else {
throw new InvalidPropertyValueException(
- 'Invalid refund receiptRegistration value', 0, 'Refund.receiptRegistration', $value
+ 'Invalid refund receiptRegistration value',
+ 0,
+ 'Refund.receiptRegistration',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid refund receiptRegistration value type', 0, 'Refund.receiptRegistration', $value
+ 'Invalid refund receiptRegistration value type',
+ 0,
+ 'Refund.receiptRegistration',
+ $value
);
}
}
@@ -371,7 +389,8 @@ class Refund extends AbstractObject implements RefundInterface
* @deprecated Не используется. Будет удален в следующих версиях
*/
public function setRequestor($value)
- {}
+ {
+ }
/**
* Возвращает данные о сделке, в составе которой проходит возврат
@@ -398,9 +417,11 @@ class Refund extends AbstractObject implements RefundInterface
$this->_deal = new RefundDealInfo($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal value type in Refund', 0, 'Refund.deal', $value
+ 'Invalid deal value type in Refund',
+ 0,
+ 'Refund.deal',
+ $value
);
}
}
-
}
diff --git a/lib/Model/RefundInterface.php b/lib/Model/RefundInterface.php
index 20cbb71a..190cc5c6 100644
--- a/lib/Model/RefundInterface.php
+++ b/lib/Model/RefundInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -51,49 +51,49 @@ interface RefundInterface
* Возвращает идентификатор возврата платежа
* @return string Идентификатор возврата
*/
- function getId();
+ public function getId();
/**
* Возвращает идентификатор платежа
* @return string Идентификатор платежа
*/
- function getPaymentId();
+ public function getPaymentId();
/**
* Возвращает статус текущего возврата
* @return string Статус возврата
*/
- function getStatus();
+ public function getStatus();
/**
* Возвращает дату создания возврата
* @return \DateTime Время создания возврата
*/
- function getCreatedAt();
+ public function getCreatedAt();
/**
* Возвращает сумму возврата
* @return AmountInterface Сумма возврата
*/
- function getAmount();
+ public function getAmount();
/**
* Возвращает статус регистрации чека
* @return string Статус регистрации чека
*/
- function getReceiptRegistration();
+ public function getReceiptRegistration();
/**
* Возвращает комментарий к возврату
* @return string Комментарий, основание для возврата средств покупателю
*/
- function getDescription();
+ public function getDescription();
/**
* Возвращает информацию о распределении денег — сколько и в какой магазин нужно перевести
* @return SourceInterface[]
*/
- function getSources();
+ public function getSources();
/**
* Возвращает сделку, в рамках которой нужно провести возврат.
diff --git a/lib/Model/RefundStatus.php b/lib/Model/RefundStatus.php
index 8684a5fc..6dbdcd5c 100644
--- a/lib/Model/RefundStatus.php
+++ b/lib/Model/RefundStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,11 @@ use YooKassa\Common\AbstractEnum;
/**
* RefundStatus - Состояние возврата платежа
- * |Код|Описание|
- * --- | ---
- * |pending|Ожидает обработки|
- * |succeeded|Успешно возвращен|
- * |canceled|В проведении возврата отказано|
*
+ * Возможные значения:
+ * - `pending` - Ожидает обработки
+ * - `succeeded` - Успешно возвращен
+ * - `canceled` - В проведении возврата отказано
*/
class RefundStatus extends AbstractEnum
{
diff --git a/lib/Model/Requestor.php b/lib/Model/Requestor.php
index 2d34cf8e..ac48a6b0 100644
--- a/lib/Model/Requestor.php
+++ b/lib/Model/Requestor.php
@@ -1,9 +1,31 @@
_type = (string)$value;
@@ -86,7 +112,9 @@ class Requestor extends AbstractObject implements RequestorInterface
$this->_accountId = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "accountId" parameter in Source', 0, 'source.accountId'
+ 'Invalid value type for "accountId" parameter in Source',
+ 0,
+ 'source.accountId'
);
} else {
$this->_accountId = (string)$value;
@@ -112,7 +140,9 @@ class Requestor extends AbstractObject implements RequestorInterface
$this->_clientId = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "accountId" parameter in Source', 0, 'source.accountId'
+ 'Invalid value type for "accountId" parameter in Source',
+ 0,
+ 'source.accountId'
);
} else {
$this->_clientId = (string)$value;
@@ -138,7 +168,9 @@ class Requestor extends AbstractObject implements RequestorInterface
$this->_clientName = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "accountId" parameter in Source', 0, 'source.accountId'
+ 'Invalid value type for "accountId" parameter in Source',
+ 0,
+ 'source.accountId'
);
} else {
$this->_clientName = (string)$value;
@@ -153,4 +185,4 @@ class Requestor extends AbstractObject implements RequestorInterface
{
return $this->_clientName;
}
-}
\ No newline at end of file
+}
diff --git a/lib/Model/RequestorInterface.php b/lib/Model/RequestorInterface.php
index f5055633..5c5d9ed4 100644
--- a/lib/Model/RequestorInterface.php
+++ b/lib/Model/RequestorInterface.php
@@ -1,5 +1,28 @@
_balance->fromArray($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid SafeDeal.balance value type', 0, 'SafeDeal.balance', $value
+ 'Invalid SafeDeal.balance value type',
+ 0,
+ 'SafeDeal.balance',
+ $value
);
}
return $this;
@@ -183,7 +186,10 @@ class SafeDeal extends BaseDeal implements DealInterface
$this->_payout_balance->fromArray($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid SafeDeal.payout_balance value type', 0, 'SafeDeal.payout_balance', $value
+ 'Invalid SafeDeal.payout_balance value type',
+ 0,
+ 'SafeDeal.payout_balance',
+ $value
);
}
return $this;
@@ -212,7 +218,10 @@ class SafeDeal extends BaseDeal implements DealInterface
$this->_status = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal status value type', 0, 'SafeDeal.status', $value
+ 'Invalid deal status value type',
+ 0,
+ 'SafeDeal.status',
+ $value
);
}
return $this;
@@ -310,7 +319,10 @@ class SafeDeal extends BaseDeal implements DealInterface
$this->_test = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid SafeDeal test flag value type', 0, 'SafeDeal.test', $value
+ 'Invalid SafeDeal test flag value type',
+ 0,
+ 'SafeDeal.test',
+ $value
);
}
return $this;
@@ -350,7 +362,10 @@ class SafeDeal extends BaseDeal implements DealInterface
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'SafeDeal.description', $value
+ 'Invalid description value type',
+ 0,
+ 'SafeDeal.description',
+ $value
);
}
return $this;
@@ -380,7 +395,10 @@ class SafeDeal extends BaseDeal implements DealInterface
$this->_metadata = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "metadata" parameter in SafeDeal', 0, 'SafeDeal.metadata', $value
+ 'Invalid value type for "metadata" parameter in SafeDeal',
+ 0,
+ 'SafeDeal.metadata',
+ $value
);
}
return $this;
diff --git a/lib/Model/SelfEmployed/SelfEmployed.php b/lib/Model/SelfEmployed/SelfEmployed.php
new file mode 100644
index 00000000..8149d8ab
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployed.php
@@ -0,0 +1,334 @@
+_id;
+ }
+
+ /**
+ * Устанавливает идентификатор самозанятого.
+ *
+ * @param string $id Идентификатор самозанятого в ЮKassa.
+ *
+ * @return $this
+ */
+ public function setId($id)
+ {
+ if (!TypeCast::canCastToString($id)) {
+ throw new InvalidPropertyValueTypeException('Invalid SelfEmployed id value type', 0, 'SelfEmployed.id', $id);
+ }
+ $length = mb_strlen($id, 'utf-8');
+ if ($length < SelfEmployedInterface::MIN_LENGTH_ID || $length > SelfEmployedInterface::MAX_LENGTH_ID) {
+ throw new InvalidPropertyValueException('Invalid SelfEmployed id value', 0, 'SelfEmployed.id', $id);
+ }
+ $this->_id = (string)$id;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает статус самозанятого.
+ *
+ * @return string Статус самозанятого
+ */
+ public function getStatus()
+ {
+ return $this->_status;
+ }
+
+ /**
+ * Устанавливает статус самозанятого.
+ *
+ * @param string $status Статус самозанятого
+ *
+ * @return $this
+ */
+ public function setStatus($status)
+ {
+ if (!TypeCast::canCastToEnumString($status)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid SelfEmployedS status value type',
+ 0,
+ 'SelfEmployedS.status',
+ $status
+ );
+ }
+ if (!SelfEmployedStatus::valueExists((string)$status)) {
+ throw new InvalidPropertyValueException('Invalid SelfEmployedS status value', 0, 'SelfEmployedS.status', $status);
+ }
+ $this->_status = (string)$status;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает время создания объекта самозанятого
+ *
+ * @return DateTime Время создания объекта самозанятого
+ */
+ public function getCreatedAt()
+ {
+ return $this->_created_at;
+ }
+
+ /**
+ * Устанавливает время создания объекта самозанятого
+ *
+ * @param DateTime|string|int $created_at Время создания объекта самозанятого
+ *
+ * @return $this
+ *
+ * @throws EmptyPropertyValueException Выбрасывается если в метод была передана пустая дата
+ * @throws InvalidPropertyValueException Выбрасывается если передали строку, которую не удалось привести к дате
+ * @throws InvalidPropertyValueTypeException|\Exception Выбрасывается если был передан аргумент, который невозможно
+ * интерпретировать как дату или время
+ */
+ public function setCreatedAt($created_at)
+ {
+ if ($created_at === null || $created_at === '') {
+ throw new EmptyPropertyValueException('Empty created_at value', 0, 'SelfEmployed.createdAt');
+ }
+ if (!TypeCast::canCastToDateTime($created_at)) {
+ throw new InvalidPropertyValueTypeException('Invalid created_at value', 0, 'SelfEmployed.createdAt', $created_at);
+ }
+ $dateTime = TypeCast::castToDateTime($created_at);
+ if ($dateTime === null) {
+ throw new InvalidPropertyValueException('Invalid created_at value', 0, 'SelfEmployed.createdAt', $created_at);
+ }
+ $this->_created_at = $dateTime;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает ИНН самозанятого
+ *
+ * @return string|null ИНН самозанятого
+ */
+ public function getItn()
+ {
+ return $this->_itn;
+ }
+
+ /**
+ * Устанавливает ИНН самозанятого
+ *
+ * @param string|null $itn ИНН самозанятого
+ *
+ * @return $this
+ */
+ public function setItn($itn = null)
+ {
+ if ($itn === null || $itn === '') {
+ $this->_itn = null;
+ } elseif (!TypeCast::canCastToString($itn)) {
+ throw new InvalidPropertyValueTypeException('Invalid itn value type', 0, 'SelfEmployed.itn');
+ } else {
+ $this->_itn = (string)preg_replace('/\D/', '', $itn);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает телефон самозанятого.
+ *
+ * @return string|null Телефон самозанятого
+ */
+ public function getPhone()
+ {
+ return $this->_phone;
+ }
+
+ /**
+ * Устанавливает телефон самозанятого.
+ *
+ * @param string|null $phone Телефон самозанятого
+ *
+ * @return $this
+ */
+ public function setPhone($phone = null)
+ {
+ if ($phone === null || $phone === '') {
+ $this->_phone = null;
+ } elseif (!TypeCast::canCastToString($phone)) {
+ throw new InvalidPropertyValueTypeException('Invalid phone value type', 0, 'SelfEmployed.phone');
+ } else {
+ $this->_phone = (string)preg_replace('/\D/', '', $phone);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает сценарий подтверждения.
+ *
+ * @return SelfEmployedConfirmation|null Сценарий подтверждения
+ */
+ public function getConfirmation()
+ {
+ return $this->_confirmation;
+ }
+
+ /**
+ * Устанавливает сценарий подтверждения.
+ *
+ * @param SelfEmployedConfirmation|array|null $confirmation Сценарий подтверждения
+ *
+ * @return $this
+ */
+ public function setConfirmation($confirmation = null)
+ {
+ if ($confirmation === null || $confirmation === '') {
+ $this->_confirmation = null;
+ } elseif (is_array($confirmation)) {
+ $factory = new SelfEmployedConfirmationFactory();
+ $this->_confirmation = $factory->factoryFromArray($confirmation);
+ } elseif ($confirmation instanceof SelfEmployedConfirmation) {
+ $this->_confirmation = $confirmation;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "confirmation" parameter in SelfEmployed',
+ 0,
+ 'SelfEmployed.confirmation',
+ $confirmation
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает признак тестовой операции.
+ *
+ * @return bool Признак тестовой операции.
+ */
+ public function getTest()
+ {
+ return $this->_test;
+ }
+
+ /**
+ * Устанавливает признак тестовой операции.
+ *
+ * @param bool $test Признак тестовой операции.
+ *
+ * @return $this
+ */
+ public function setTest($test)
+ {
+ if ($test === null || $test === '') {
+ throw new EmptyPropertyValueException('Empty SelfEmployed test flag value', 0, 'SelfEmployed.test');
+ }
+ if (!TypeCast::canCastToBoolean($test)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid SelfEmployed test flag value type',
+ 0,
+ 'SelfEmployed.test',
+ $test
+ );
+ }
+ $this->_test = (bool)$test;
+
+ return $this;
+ }
+}
diff --git a/lib/Model/SelfEmployed/SelfEmployedConfirmation.php b/lib/Model/SelfEmployed/SelfEmployedConfirmation.php
new file mode 100644
index 00000000..e42df20e
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployedConfirmation.php
@@ -0,0 +1,91 @@
+_type;
+ }
+
+ /**
+ * Устанавливает тип сценария подтверждения
+ * @param string $value
+ */
+ protected function setType($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException(
+ 'Empty value for "type" parameter in SelfEmployedConfirmation',
+ 0,
+ 'confirmation.type'
+ );
+ }
+ if (!TypeCast::canCastToEnumString($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "type" parameter in SelfEmployedConfirmation',
+ 0,
+ 'confirmation.type',
+ $value
+ );
+ }
+ if (!SelfEmployedConfirmationType::valueExists($value)) {
+ throw new InvalidPropertyValueException(
+ 'Invalid value for "type" parameter in SelfEmployedConfirmation',
+ 0,
+ 'confirmation.type',
+ $value
+ );
+ }
+ $this->_type = (string)$value;
+ }
+}
diff --git a/lib/Model/SelfEmployed/SelfEmployedConfirmationFactory.php b/lib/Model/SelfEmployed/SelfEmployedConfirmationFactory.php
new file mode 100644
index 00000000..5b031334
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployedConfirmationFactory.php
@@ -0,0 +1,89 @@
+ 'SelfEmployedConfirmationRedirect',
+ );
+
+ /**
+ * Возвращает объект, соответствующий типу подтверждения платежа
+ *
+ * @param string $type Тип подтверждения платежа
+ *
+ * @return SelfEmployedConfirmation
+ */
+ public function factory($type)
+ {
+ if (!is_string($type)) {
+ throw new \InvalidArgumentException('Invalid confirmation value in confirmation factory');
+ }
+ if (!array_key_exists($type, $this->typeClassMap)) {
+ throw new \InvalidArgumentException('Invalid confirmation value type "' . $type . '"');
+ }
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
+
+ return new $className();
+ }
+
+ /**
+ * Возвращает объект, соответствующий типу подтверждения платежа, из массива данных
+ *
+ * @param array $data Массив данных подтверждения платежа
+ * @param string|null $type Тип подтверждения платежа
+ *
+ * @return SelfEmployedConfirmation
+ */
+ public function factoryFromArray(array $data, $type = null)
+ {
+ if ($type === null) {
+ if (array_key_exists('type', $data)) {
+ $type = $data['type'];
+ unset($data['type']);
+ } else {
+ throw new \InvalidArgumentException(
+ 'Parameter type not specified in SelfEmployedConfirmation.factoryFromArray()'
+ );
+ }
+ }
+ $confirmation = $this->factory($type);
+ foreach ($data as $key => $value) {
+ if ($confirmation->offsetExists($key)) {
+ $confirmation->offsetSet($key, $value);
+ }
+ }
+
+ return $confirmation;
+ }
+}
diff --git a/lib/Model/SelfEmployed/SelfEmployedConfirmationRedirect.php b/lib/Model/SelfEmployed/SelfEmployedConfirmationRedirect.php
new file mode 100644
index 00000000..e81e1fa7
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployedConfirmationRedirect.php
@@ -0,0 +1,86 @@
+setType(SelfEmployedConfirmationType::REDIRECT);
+ }
+
+ /**
+ * Возвращает confirmation_url.
+ *
+ * @return string|null
+ */
+ public function getConfirmationUrl()
+ {
+ return $this->_confirmation_url;
+ }
+
+ /**
+ * Устанавливает confirmation_url.
+ *
+ * @param string|null $confirmation_url URL, на который необходимо перенаправить самозанятого для выдачи прав.
+ *
+ * @return $this
+ */
+ public function setConfirmationUrl($confirmation_url)
+ {
+ if ($confirmation_url === null || $confirmation_url === '') {
+ $this->_confirmation_url = null;
+ } elseif (!TypeCast::canCastToString($confirmation_url)) {
+ throw new InvalidPropertyValueTypeException('Invalid confirmation_url value type', 0, 'SelfEmployedConfirmationRedirect.confirmation_url');
+ } else {
+ $this->_confirmation_url = $confirmation_url;
+ }
+
+ return $this;
+ }
+}
diff --git a/lib/Model/SelfEmployed/SelfEmployedConfirmationType.php b/lib/Model/SelfEmployed/SelfEmployedConfirmationType.php
new file mode 100644
index 00000000..adb9624a
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployedConfirmationType.php
@@ -0,0 +1,50 @@
+ true,
+ );
+}
diff --git a/lib/Model/SelfEmployed/SelfEmployedInterface.php b/lib/Model/SelfEmployed/SelfEmployedInterface.php
new file mode 100644
index 00000000..ea528e9a
--- /dev/null
+++ b/lib/Model/SelfEmployed/SelfEmployedInterface.php
@@ -0,0 +1,174 @@
+ true,
+ self::CONFIRMED => true,
+ self::CANCELED => true,
+ );
+}
diff --git a/lib/Model/Settlement.php b/lib/Model/Settlement.php
index da77aaed..f35fdb0c 100644
--- a/lib/Model/Settlement.php
+++ b/lib/Model/Settlement.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Common\Exceptions\EmptyPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
@@ -70,19 +69,27 @@ class Settlement extends AbstractObject implements SettlementInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "type" parameter in Settlement', 0, 'settlement.type'
+ 'Empty value for "type" parameter in Settlement',
+ 0,
+ 'settlement.type'
);
} elseif (TypeCast::canCastToEnumString($value)) {
if (SettlementType::valueExists($value)) {
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid value for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "type" parameter in Settlement', 0, 'settlement.type', $value
+ 'Invalid value type for "type" parameter in Settlement',
+ 0,
+ 'settlement.type',
+ $value
);
}
}
@@ -104,7 +111,9 @@ class Settlement extends AbstractObject implements SettlementInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "amount" parameter in Settlement', 0, 'settlement.amount'
+ 'Empty value for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount'
);
} elseif (is_array($value)) {
$this->_amount = $this->factoryAmount($value);
@@ -112,7 +121,10 @@ class Settlement extends AbstractObject implements SettlementInterface
$this->_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "amount" parameter in Settlement', 0, 'settlement.amount', $value
+ 'Invalid value type for "amount" parameter in Settlement',
+ 0,
+ 'settlement.amount',
+ $value
);
}
}
diff --git a/lib/Model/SettlementInterface.php b/lib/Model/SettlementInterface.php
index 0d15e03d..7b8fe448 100644
--- a/lib/Model/SettlementInterface.php
+++ b/lib/Model/SettlementInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -40,11 +40,11 @@ interface SettlementInterface
* Возвращает вид оплаты в чеке (cashless | prepayment | postpayment | consideration)
* @return string Вид оплаты в чеке
*/
- function getType();
+ public function getType();
/**
* Возвращает размер оплаты
* @return AmountInterface Размер оплаты
*/
- function getAmount();
+ public function getAmount();
}
diff --git a/lib/Model/Source.php b/lib/Model/Source.php
index a5244e93..94e40eba 100644
--- a/lib/Model/Source.php
+++ b/lib/Model/Source.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -62,11 +62,15 @@ class Source extends AbstractObject implements SourceInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "accountId" parameter in Source', 0, 'source.accountId'
+ 'Empty value for "accountId" parameter in Source',
+ 0,
+ 'source.accountId'
);
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "accountId" parameter in Source', 0, 'source.accountId'
+ 'Invalid value type for "accountId" parameter in Source',
+ 0,
+ 'source.accountId'
);
} else {
$this->_accountId = (string)$value;
@@ -104,7 +108,9 @@ class Source extends AbstractObject implements SourceInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "amount" parameter in Source', 0, 'source.amount'
+ 'Empty value for "amount" parameter in Source',
+ 0,
+ 'source.amount'
);
} elseif (is_array($value)) {
$this->_amount = $this->factoryAmount($value);
@@ -112,7 +118,10 @@ class Source extends AbstractObject implements SourceInterface
$this->_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "amount" parameter in Source', 0, 'source.amount', $value
+ 'Invalid value type for "amount" parameter in Source',
+ 0,
+ 'source.amount',
+ $value
);
}
}
@@ -140,7 +149,9 @@ class Source extends AbstractObject implements SourceInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "platform_fee_amount" parameter in Source', 0, 'source.platform_fee_amount'
+ 'Empty value for "platform_fee_amount" parameter in Source',
+ 0,
+ 'source.platform_fee_amount'
);
} elseif (is_array($value)) {
$this->_platform_fee_amount = $this->factoryAmount($value);
@@ -148,7 +159,10 @@ class Source extends AbstractObject implements SourceInterface
$this->_platform_fee_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "platform_fee_amount" parameter in Source', 0, 'source.platform_fee_amount', $value
+ 'Invalid value type for "platform_fee_amount" parameter in Source',
+ 0,
+ 'source.platform_fee_amount',
+ $value
);
}
}
diff --git a/lib/Model/SourceInterface.php b/lib/Model/SourceInterface.php
index 99d6381f..8a610ea0 100644
--- a/lib/Model/SourceInterface.php
+++ b/lib/Model/SourceInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Model/Supplier.php b/lib/Model/Supplier.php
index e1375244..41c5c170 100644
--- a/lib/Model/Supplier.php
+++ b/lib/Model/Supplier.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueTypeException;
@@ -116,7 +115,7 @@ class Supplier extends AbstractObject implements SupplierInterface
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException('Invalid inn value type', 0, 'receipt.supplier.inn');
} elseif (!preg_match('/^([0-9]{10}|[0-9]{12})$/', (string)$value)) {
- throw new InvalidPropertyValueException('Invalid inn value: "'.$value.'"', 0, 'receipt.supplier.inn');
+ throw new InvalidPropertyValueException('Invalid inn value: "' . $value . '"', 0, 'receipt.supplier.inn');
} else {
$this->_inn = (string)$value;
}
diff --git a/lib/Model/SupplierInterface.php b/lib/Model/SupplierInterface.php
index 0e23c7b1..8eef833e 100644
--- a/lib/Model/SupplierInterface.php
+++ b/lib/Model/SupplierInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@ interface SupplierInterface
/**
* Устанавливает ИНН пользователя (10 или 12 цифр)
- * @param $value ИНН пользователя
+ * @param string|null $value ИНН пользователя
*/
public function setInn($value);
}
diff --git a/lib/Model/ThreeDSecure.php b/lib/Model/ThreeDSecure.php
index 3932b9aa..b220a477 100644
--- a/lib/Model/ThreeDSecure.php
+++ b/lib/Model/ThreeDSecure.php
@@ -1,5 +1,29 @@
_applied = (bool)$value;
}
-}
\ No newline at end of file
+}
diff --git a/lib/Model/Transfer.php b/lib/Model/Transfer.php
index c99513b6..aa2db355 100644
--- a/lib/Model/Transfer.php
+++ b/lib/Model/Transfer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,7 @@ use YooKassa\Helpers\TypeCast;
* @property string $accountId Идентификатор магазина, в пользу которого вы принимаете оплату
* @property string $status Статус распределения денег между магазинами. Возможные значения: `pending`, `waiting_for_capture`, `succeeded`, `canceled`
* @property string $description Описание транзакции, которое продавец увидит в личном кабинете ЮKassa. (например: «Заказ маркетплейса №72»)
- * @property Metadata $metadata Любые дополнительные данные, которые нужны вам для работы с платежами (например, номер заказа)
+ * @property Metadata $metadata Любые дополнительные данные, которые нужны вам для работы с платежами (например, ваш внутренний идентификатор заказа)
*
* @package YooKassa
*/
@@ -53,32 +53,32 @@ class Transfer extends AbstractObject implements TransferInterface
const MAX_LENGTH_DESCRIPTION = 128;
/**
- * @var string
+ * @var string Идентификатор магазина, в пользу которого вы принимаете оплату. Выдается ЮKassa, отображается в разделе Продавцы личного кабинета (столбец shopId).
*/
private $_accountId;
/**
- * @var AmountInterface
+ * @var AmountInterface Сумма, которую необходимо перечислить магазину.
*/
private $_amount;
/**
- * @var AmountInterface
+ * @var AmountInterface Комиссия за проданные товары и услуги, которая удерживается с магазина в вашу пользу.
*/
private $_platform_fee_amount;
/**
- * @var string
+ * @var string Статус распределения денег между магазинами. Возможные значения: pending, waiting_for_capture, succeeded, canceled.
*/
private $_status;
/**
- * @var string
+ * @var string Описание транзакции (не более 128 символов), которое продавец увидит в личном кабинете ЮKassa. Например: «Заказ маркетплейса №72».
*/
private $_description;
/**
- * @var string
+ * @var string Любые дополнительные данные, которые нужны вам для работы (например, ваш внутренний идентификатор заказа).
*/
private $_metadata;
@@ -89,11 +89,15 @@ class Transfer extends AbstractObject implements TransferInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "accountId" parameter in Transfer', 0, 'transfer.accountId'
+ 'Empty value for "accountId" parameter in Transfer',
+ 0,
+ 'transfer.accountId'
);
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "accountId" parameter in Transfer', 0, 'transfer.accountId'
+ 'Invalid value type for "accountId" parameter in Transfer',
+ 0,
+ 'transfer.accountId'
);
} else {
$this->_accountId = (string)$value;
@@ -131,7 +135,9 @@ class Transfer extends AbstractObject implements TransferInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "amount" parameter in Transfer', 0, 'transfer.amount'
+ 'Empty value for "amount" parameter in Transfer',
+ 0,
+ 'transfer.amount'
);
} elseif (is_array($value)) {
$this->_amount = $this->factoryAmount($value);
@@ -139,7 +145,10 @@ class Transfer extends AbstractObject implements TransferInterface
$this->_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "amount" parameter in Transfer', 0, 'transfer.amount', $value
+ 'Invalid value type for "amount" parameter in Transfer',
+ 0,
+ 'transfer.amount',
+ $value
);
}
}
@@ -167,7 +176,9 @@ class Transfer extends AbstractObject implements TransferInterface
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty value for "platform_fee_amount" parameter in Transfer', 0, 'transfer.platform_fee_amount'
+ 'Empty value for "platform_fee_amount" parameter in Transfer',
+ 0,
+ 'transfer.platform_fee_amount'
);
} elseif (is_array($value)) {
$this->_platform_fee_amount = $this->factoryAmount($value);
@@ -175,7 +186,10 @@ class Transfer extends AbstractObject implements TransferInterface
$this->_platform_fee_amount = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "platform_fee_amount" parameter in Transfer', 0, 'transfer.platform_fee_amount', $value
+ 'Invalid value type for "platform_fee_amount" parameter in Transfer',
+ 0,
+ 'transfer.platform_fee_amount',
+ $value
);
}
}
@@ -187,11 +201,17 @@ class Transfer extends AbstractObject implements TransferInterface
{
if (!TypeCast::canCastToEnumString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid "status" value type', 0, 'transfer.status', $value
+ 'Invalid "status" value type',
+ 0,
+ 'transfer.status',
+ $value
);
} elseif (!TransferStatus::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid "status" value', 0, 'transfer.status', $value
+ 'Invalid "status" value',
+ 0,
+ 'transfer.status',
+ $value
);
} else {
$this->_status = (string)$value;
@@ -226,7 +246,10 @@ class Transfer extends AbstractObject implements TransferInterface
if (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'Transfer.description', $value
+ 'Invalid description value type',
+ 0,
+ 'Transfer.description',
+ $value
);
}
@@ -263,7 +286,10 @@ class Transfer extends AbstractObject implements TransferInterface
$this->_metadata = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "metadata" parameter in Transfer', 0, 'transfer.metadata', $value
+ 'Invalid value type for "metadata" parameter in Transfer',
+ 0,
+ 'transfer.metadata',
+ $value
);
}
}
diff --git a/lib/Model/TransferInterface.php b/lib/Model/TransferInterface.php
index 13b13e4f..1f7b144a 100644
--- a/lib/Model/TransferInterface.php
+++ b/lib/Model/TransferInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,7 @@ namespace YooKassa\Model;
* @property string $accountId Идентификатор магазина, в пользу которого вы принимаете оплату
* @property string $status Статус распределения денег между магазинами. Возможные значения: `pending`, `waiting_for_capture`, `succeeded`, `canceled`
* @property string $description Описание транзакции, которое продавец увидит в личном кабинете ЮKassa. (например: «Заказ маркетплейса №72»)
- * @property Metadata $metadata Любые дополнительные данные, которые нужны вам для работы с платежами (например, номер заказа)
+ * @property Metadata $metadata Любые дополнительные данные, которые нужны вам для работы с платежами (например, ваш внутренний идентификатор заказа)
*
* @package YooKassa
*/
diff --git a/lib/Model/TransferStatus.php b/lib/Model/TransferStatus.php
index a6652705..9561a109 100644
--- a/lib/Model/TransferStatus.php
+++ b/lib/Model/TransferStatus.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,24 +26,26 @@
namespace YooKassa\Model;
-
use YooKassa\Common\AbstractEnum;
/**
* PaymentStatus - Статус операции распределения средств конечному получателю
- * |Код|Описание|
- * --- | ---
- * |pending|Ожидает оплаты покупателем|
- * |waiting_for_capture|Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)|
- * |succeeded|Успешно оплачен и получен магазином|
- * |canceled|Неуспех оплаты или отменен магазином (cancel)|
*
+ * Возможные значения:
+ * - `pending` - Ожидает оплаты покупателем
+ * - `waiting_for_capture` - Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso)
+ * - `succeeded` - Успешно оплачен и получен магазином
+ * - `canceled` - Неуспех оплаты или отменен магазином (cancel)
*/
class TransferStatus extends AbstractEnum
{
+ /** Ожидает оплаты покупателем */
const PENDING = 'pending';
+ /** Успешно оплачен покупателем, ожидает подтверждения магазином (capture или aviso) */
const WAITING_FOR_CAPTURE = 'waiting_for_capture';
+ /** Успешно оплачен и получен магазином */
const SUCCEEDED = 'succeeded';
+ /** Неуспех оплаты или отменен магазином (cancel) */
const CANCELED = 'canceled';
protected static $validValues = array(
diff --git a/lib/Model/Webhook/Webhook.php b/lib/Model/Webhook/Webhook.php
index 43d8b457..ea65ed97 100644
--- a/lib/Model/Webhook/Webhook.php
+++ b/lib/Model/Webhook/Webhook.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Model\Webhook;
-
use YooKassa\Common\AbstractObject;
use YooKassa\Model\NotificationEventType;
diff --git a/lib/Request/Deals/AbstractDealResponse.php b/lib/Request/Deals/AbstractDealResponse.php
index c0823661..b8e20060 100644
--- a/lib/Request/Deals/AbstractDealResponse.php
+++ b/lib/Request/Deals/AbstractDealResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -35,4 +35,5 @@ use YooKassa\Model\SafeDeal;
* @package YooKassa
*/
abstract class AbstractDealResponse extends SafeDeal implements DealInterface
-{}
+{
+}
diff --git a/lib/Request/Deals/CreateDealRequest.php b/lib/Request/Deals/CreateDealRequest.php
index e036e354..342d14b0 100644
--- a/lib/Request/Deals/CreateDealRequest.php
+++ b/lib/Request/Deals/CreateDealRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,10 @@ class CreateDealRequest extends AbstractRequest implements CreateDealRequestInte
$this->_type = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal type value type', 0, 'CreateDealRequest.type', $value
+ 'Invalid deal type value type',
+ 0,
+ 'CreateDealRequest.type',
+ $value
);
}
}
@@ -143,7 +146,10 @@ class CreateDealRequest extends AbstractRequest implements CreateDealRequestInte
$this->_fee_moment = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid fee_moment value type in CreateDealRequest', 0, 'CreateDealRequest.fee_moment', $value
+ 'Invalid fee_moment value type in CreateDealRequest',
+ 0,
+ 'CreateDealRequest.fee_moment',
+ $value
);
}
}
@@ -181,7 +187,10 @@ class CreateDealRequest extends AbstractRequest implements CreateDealRequestInte
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'CreateDealRequest.description', $value
+ 'Invalid description value type',
+ 0,
+ 'CreateDealRequest.description',
+ $value
);
}
}
@@ -230,7 +239,10 @@ class CreateDealRequest extends AbstractRequest implements CreateDealRequestInte
$this->_metadata = new Metadata($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid metadata value type in CreateDealRequest', 0, 'CreateDealRequest.metadata', $value
+ 'Invalid metadata value type in CreateDealRequest',
+ 0,
+ 'CreateDealRequest.metadata',
+ $value
);
}
}
diff --git a/lib/Request/Deals/CreateDealRequestBuilder.php b/lib/Request/Deals/CreateDealRequestBuilder.php
index 122f2d76..c32f7613 100644
--- a/lib/Request/Deals/CreateDealRequestBuilder.php
+++ b/lib/Request/Deals/CreateDealRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Deals/CreateDealRequestInterface.php b/lib/Request/Deals/CreateDealRequestInterface.php
index ebb49ed0..23afd674 100644
--- a/lib/Request/Deals/CreateDealRequestInterface.php
+++ b/lib/Request/Deals/CreateDealRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -52,13 +52,13 @@ interface CreateDealRequestInterface
* Проверяет наличие типа в создаваемой сделке
* @return bool True если тип сделки установлен, false если нет
*/
- function hasType();
+ public function hasType();
/**
* Устанавливает тип сделки
* @param string $value Тип сделки
*/
- function setType($value);
+ public function setType($value);
/**
* Возвращает момент перечисления вам вознаграждения платформы
@@ -71,13 +71,13 @@ interface CreateDealRequestInterface
* Проверяет наличие момента перечисления вознаграждения в создаваемой сделке
* @return bool True если момент перечисления вознаграждения установлен, false если нет
*/
- function hasFeeMoment();
+ public function hasFeeMoment();
/**
* Устанавливает момент перечисления вознаграждения платформы
* @param string $value Момент перечисления вознаграждения
*/
- function setFeeMoment($value);
+ public function setFeeMoment($value);
/**
* Возвращает описание сделки (не более 128 символов).
@@ -90,13 +90,13 @@ interface CreateDealRequestInterface
* Проверяет наличие описания в создаваемой сделке
* @return bool True если описание сделки установлено, false если нет
*/
- function hasDescription();
+ public function hasDescription();
/**
* Устанавливает описание сделки
* @param string $value Описание сделки
*/
- function setDescription($value);
+ public function setDescription($value);
/**
* Возвращает дополнительные данные сделки
@@ -109,11 +109,11 @@ interface CreateDealRequestInterface
* Проверяет, были ли установлены метаданные сделки
* @return bool True если метаданные были установлены, false если нет
*/
- function hasMetadata();
+ public function hasMetadata();
/**
* Устанавливает метаданные, привязанные к сделке
* @param Metadata|array|null $value Метаданные сделки, устанавливаемые мерчантом
*/
- function setMetadata($value);
+ public function setMetadata($value);
}
diff --git a/lib/Request/Deals/CreateDealRequestSerializer.php b/lib/Request/Deals/CreateDealRequestSerializer.php
index 35539d33..17a6375c 100644
--- a/lib/Request/Deals/CreateDealRequestSerializer.php
+++ b/lib/Request/Deals/CreateDealRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ class CreateDealRequestSerializer
/**
* Формирует ассоциативный массив данных из объекта запроса
*
- * @param CreateDealRequestInterface|AbstractRequest $request Объект запроса
+ * @param CreateDealRequestInterface $request Объект запроса
* @return array Массив данных для дальнейшего кодирования в JSON
*/
public function serialize(CreateDealRequestInterface $request)
@@ -60,5 +60,4 @@ class CreateDealRequestSerializer
return $result;
}
-
}
diff --git a/lib/Request/Deals/CreateDealResponse.php b/lib/Request/Deals/CreateDealResponse.php
index d18b55ba..7cbfc3a1 100644
--- a/lib/Request/Deals/CreateDealResponse.php
+++ b/lib/Request/Deals/CreateDealResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Deals;
* @package YooKassa
*/
class CreateDealResponse extends AbstractDealResponse
-{}
+{
+}
diff --git a/lib/Request/Deals/DealResponse.php b/lib/Request/Deals/DealResponse.php
index 638ecb2d..3dcc5d30 100644
--- a/lib/Request/Deals/DealResponse.php
+++ b/lib/Request/Deals/DealResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Deals;
* @package YooKassa
*/
class DealResponse extends AbstractDealResponse
-{}
+{
+}
diff --git a/lib/Request/Deals/DealsRequest.php b/lib/Request/Deals/DealsRequest.php
index 5a5dfe0f..5114d86d 100644
--- a/lib/Request/Deals/DealsRequest.php
+++ b/lib/Request/Deals/DealsRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -148,13 +148,19 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
} elseif (is_int($value)) {
if ($value < 0 || $value > self::MAX_LIMIT_VALUE) {
throw new InvalidPropertyValueException(
- 'Invalid limit value in DealsRequest', 0, 'DealsRequest.limit', $value
+ 'Invalid limit value in DealsRequest',
+ 0,
+ 'DealsRequest.limit',
+ $value
);
}
$this->_limit = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid limit value type in DealsRequest', 0, 'DealsRequest.limit', $value
+ 'Invalid limit value type in DealsRequest',
+ 0,
+ 'DealsRequest.limit',
+ $value
);
}
}
@@ -191,7 +197,10 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$this->_cursor = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in DealsRequest', 0, 'DealsRequest.limit', $value
+ 'Invalid status value type in DealsRequest',
+ 0,
+ 'DealsRequest.limit',
+ $value
);
}
}
@@ -231,13 +240,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtGte value in DealsRequest', 0, 'PaymentRequest.createdAtGte'
+ 'Invalid createdAtGte value in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtGte'
);
}
$this->_createdAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtGte value type in DealsRequest', 0, 'PaymentRequest.createdAtGte'
+ 'Invalid createdAtGte value type in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtGte'
);
}
}
@@ -277,13 +290,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtGt value in DealsRequest', 0, 'PaymentRequest.createdAtGt'
+ 'Invalid createdAtGt value in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtGt'
);
}
$this->_createdAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtGt value type in DealsRequest', 0, 'PaymentRequest.createdAtGt'
+ 'Invalid createdAtGt value type in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtGt'
);
}
}
@@ -323,13 +340,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtLte value in DealsRequest', 0, 'PaymentRequest.createdAtLte'
+ 'Invalid createdAtLte value in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtLte'
);
}
$this->_createdAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtLte value type in DealsRequest', 0, 'PaymentRequest.createdAtLte'
+ 'Invalid createdAtLte value type in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtLte'
);
}
}
@@ -369,13 +390,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtLt value in DealsRequest', 0, 'PaymentRequest.createdAtLt'
+ 'Invalid createdAtLt value in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtLt'
);
}
$this->_createdAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAlLt value type in DealsRequest', 0, 'PaymentRequest.createdAtLt'
+ 'Invalid createdAlLt value type in DealsRequest',
+ 0,
+ 'PaymentRequest.createdAtLt'
);
}
}
@@ -415,13 +440,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid expiresAtGte value in DealsRequest', 0, 'PaymentRequest.expiresAtGte'
+ 'Invalid expiresAtGte value in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtGte'
);
}
$this->_expiresAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid expiresAtGte value type in DealsRequest', 0, 'PaymentRequest.expiresAtGte'
+ 'Invalid expiresAtGte value type in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtGte'
);
}
}
@@ -461,13 +490,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid expiresAtGt value in DealsRequest', 0, 'PaymentRequest.expiresAtGt'
+ 'Invalid expiresAtGt value in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtGt'
);
}
$this->_expiresAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid expiresAtGt value type in DealsRequest', 0, 'PaymentRequest.expiresAtGt'
+ 'Invalid expiresAtGt value type in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtGt'
);
}
}
@@ -507,13 +540,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid expiresAtLte value in DealsRequest', 0, 'PaymentRequest.expiresAtLte'
+ 'Invalid expiresAtLte value in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtLte'
);
}
$this->_expiresAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid expiresAtLte value type in DealsRequest', 0, 'PaymentRequest.expiresAtLte'
+ 'Invalid expiresAtLte value type in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtLte'
);
}
}
@@ -553,13 +590,17 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid expiresAtLt value in DealsRequest', 0, 'PaymentRequest.expiresAtLt'
+ 'Invalid expiresAtLt value in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtLt'
);
}
$this->_expiresAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid expiresAlLt value type in DealsRequest', 0, 'PaymentRequest.expiresAtLt'
+ 'Invalid expiresAlLt value type in DealsRequest',
+ 0,
+ 'PaymentRequest.expiresAtLt'
);
}
}
@@ -596,14 +637,20 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
} elseif (TypeCast::canCastToEnumString($value)) {
if (!DealStatus::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid status value in DealsRequest', 0, 'DealsRequest.status', $value
+ 'Invalid status value in DealsRequest',
+ 0,
+ 'DealsRequest.status',
+ $value
);
} else {
$this->_status = (string)$value;
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value in DealsRequest', 0, 'DealsRequest.status', $value
+ 'Invalid status value in DealsRequest',
+ 0,
+ 'DealsRequest.status',
+ $value
);
}
}
@@ -658,7 +705,10 @@ class DealsRequest extends AbstractRequest implements DealsRequestInterface
$this->_fullTextSearch = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in DealsRequest', 0, 'DealsRequest.fullTextSearch', $value
+ 'Invalid status value type in DealsRequest',
+ 0,
+ 'DealsRequest.fullTextSearch',
+ $value
);
}
}
diff --git a/lib/Request/Deals/DealsRequestBuilder.php b/lib/Request/Deals/DealsRequestBuilder.php
index 66c2457d..07048efd 100644
--- a/lib/Request/Deals/DealsRequestBuilder.php
+++ b/lib/Request/Deals/DealsRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Deals/DealsRequestInterface.php b/lib/Request/Deals/DealsRequestInterface.php
index 1d8dd1e7..5d0209d8 100644
--- a/lib/Request/Deals/DealsRequestInterface.php
+++ b/lib/Request/Deals/DealsRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,227 +50,227 @@ interface DealsRequestInterface
* Возвращает страницу выдачи результатов или null, если она до этого не была установлена
* @return string|null Страница выдачи результатов
*/
- function getCursor();
+ public function getCursor();
/**
* Проверяет, была ли установлена страница выдачи результатов
* @return bool True если страница выдачи результатов была установлена, false если нет
*/
- function hasCursor();
+ public function hasCursor();
/**
* Устанавливает страницу выдачи результатов
* @param string $value Страница
* @return void
*/
- function setCursor($value);
+ public function setCursor($value);
/**
* Возвращает дату создания от которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время создания, от (включительно)
*/
- function getCreatedAtGte();
+ public function getCreatedAtGte();
/**
* Проверяет, была ли установлена дата создания от которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGte();
+ public function hasCreatedAtGte();
/**
* Устанавливает дату создания от которой выбираются сделки
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtGte($value);
+ public function setCreatedAtGte($value);
/**
* Возвращает дату создания от которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время создания, от (не включая)
*/
- function getCreatedAtGt();
+ public function getCreatedAtGt();
/**
* Проверяет, была ли установлена дата создания от которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGt();
+ public function hasCreatedAtGt();
/**
* Устанавливает дату создания от которой выбираются сделки
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtGt($value);
+ public function setCreatedAtGt($value);
/**
* Возвращает дату создания до которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время создания, до (включительно)
*/
- function getCreatedAtLte();
+ public function getCreatedAtLte();
/**
* Проверяет, была ли установлена дата создания до которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLte();
+ public function hasCreatedAtLte();
/**
* Устанавливает дату создания до которой выбираются сделки
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtLte($value);
+ public function setCreatedAtLte($value);
/**
* Возвращает дату создания до которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время создания, до (не включая)
*/
- function getCreatedAtLt();
+ public function getCreatedAtLt();
/**
* Проверяет, была ли установлена дата создания до которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLt();
+ public function hasCreatedAtLt();
/**
* Устанавливает дату создания до которой выбираются сделки
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtLt($value);
+ public function setCreatedAtLt($value);
/**
* Возвращает дату автоматического закрытия от которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время автоматического закрытия, от (включительно)
*/
- function getExpiresAtGte();
+ public function getExpiresAtGte();
/**
* Проверяет, была ли установлена дата автоматического закрытия от которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasExpiresAtGte();
+ public function hasExpiresAtGte();
/**
* Устанавливает дату автоматического закрытия от которой выбираются сделки
* @param \DateTime $value Дата
* @return void
*/
- function setExpiresAtGte($value);
+ public function setExpiresAtGte($value);
/**
* Возвращает дату автоматического закрытия от которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время автоматического закрытия, от (не включая)
*/
- function getExpiresAtGt();
+ public function getExpiresAtGt();
/**
* Проверяет, была ли установлена дата автоматического закрытия от которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasExpiresAtGt();
+ public function hasExpiresAtGt();
/**
* Устанавливает дату автоматического закрытия от которой выбираются сделки
* @param \DateTime $value Дата автоматического закрытия
* @return void
*/
- function setExpiresAtGt($value);
+ public function setExpiresAtGt($value);
/**
* Возвращает дату автоматического закрытия до которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время автоматического закрытия, до (включительно)
*/
- function getExpiresAtLte();
+ public function getExpiresAtLte();
/**
* Проверяет, была ли установлена дата автоматического закрытия до которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasExpiresAtLte();
+ public function hasExpiresAtLte();
/**
* Устанавливает дату автоматического закрытия до которой выбираются сделки
* @param \DateTime $value Дата автоматического закрытия
* @return void
*/
- function setExpiresAtLte($value);
+ public function setExpiresAtLte($value);
/**
* Возвращает дату автоматического закрытия до которой будут возвращены сделки или null, если дата не была установлена
* @return \DateTime|null Время автоматического закрытия, до (не включая)
*/
- function getExpiresAtLt();
+ public function getExpiresAtLt();
/**
* Проверяет, была ли установлена автоматического закрытия до которой выбираются сделки
* @return bool True если дата была установлена, false если нет
*/
- function hasExpiresAtLt();
+ public function hasExpiresAtLt();
/**
* Устанавливает дату автоматического закрытия до которой выбираются сделки
* @param \DateTime $value Дата автоматического закрытия
* @return void
*/
- function setExpiresAtLt($value);
+ public function setExpiresAtLt($value);
/**
* Возвращает ограничение количества объектов сделок или null, если оно до этого не было установлено
* @return string|null Ограничение количества объектов сделок
*/
- function getLimit();
+ public function getLimit();
/**
* Проверяет, было ли установлено ограничение количества объектов сделок
* @return bool True если ограничение количества объектов сделок было установлено, false если нет
*/
- function hasLimit();
+ public function hasLimit();
/**
* Устанавливает ограничение количества объектов сделок
* @param int $value Количества объектов сделок на странице
* @return void
*/
- function setLimit($value);
+ public function setLimit($value);
/**
* Возвращает статус выбираемых сделок или null, если он до этого не был установлен
* @return string|null Статус выбираемых сделок
*/
- function getStatus();
+ public function getStatus();
/**
* Проверяет, был ли установлен статус выбираемых сделок
* @return bool True если статус был установлен, false если нет
*/
- function hasStatus();
+ public function hasStatus();
/**
* Устанавливает статус выбираемых сделок
* @param string $value Статус сделок
* @return void
*/
- function setStatus($value);
+ public function setStatus($value);
/**
* Возвращает фильтр по описанию сделки или null, если он до этого не был установлен
* @return string|null Фильтр по описанию сделки
*/
- function getFullTextSearch();
+ public function getFullTextSearch();
/**
* Проверяет, был ли установлен фильтр по описанию сделки
* @return bool True если фильтр по описанию сделки был установлен, false если нет
*/
- function hasFullTextSearch();
+ public function hasFullTextSearch();
/**
* Устанавливает фильтр по описанию сделки
* @param string $value Фильтр по описанию сделки
* @return void
*/
- function setFullTextSearch($value);
+ public function setFullTextSearch($value);
}
diff --git a/lib/Request/Deals/DealsRequestSerializer.php b/lib/Request/Deals/DealsRequestSerializer.php
index 51a3137d..21ad035e 100644
--- a/lib/Request/Deals/DealsRequestSerializer.php
+++ b/lib/Request/Deals/DealsRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Deals/DealsResponse.php b/lib/Request/Deals/DealsResponse.php
index eb31c462..a0ef7134 100644
--- a/lib/Request/Deals/DealsResponse.php
+++ b/lib/Request/Deals/DealsResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -90,5 +90,4 @@ class DealsResponse extends AbstractObject
{
return $this->nextCursor !== null;
}
-
}
diff --git a/lib/Request/Payments/AbstractPaymentResponse.php b/lib/Request/Payments/AbstractPaymentResponse.php
index e5a11fc4..328aaf94 100644
--- a/lib/Request/Payments/AbstractPaymentResponse.php
+++ b/lib/Request/Payments/AbstractPaymentResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -146,13 +146,12 @@ abstract class AbstractPaymentResponse extends Payment implements PaymentInterfa
$confirmation->setReturnUrl($sourceArray['confirmation']['return_url']);
}
break;
-
}
if (isset($confirmation)) {
$this->setConfirmation($confirmation);
} else {
- throw new InvalidArgumentException('confirmation type '.$confirmationType.' is incorrect');
+ throw new InvalidArgumentException('confirmation type ' . $confirmationType . ' is incorrect');
}
}
if (!empty($sourceArray['refunded_amount'])) {
diff --git a/lib/Request/Payments/CreatePaymentRequest.php b/lib/Request/Payments/CreatePaymentRequest.php
index 73966da6..fd8003d4 100644
--- a/lib/Request/Payments/CreatePaymentRequest.php
+++ b/lib/Request/Payments/CreatePaymentRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ use YooKassa\Model\AirlineInterface;
use YooKassa\Model\AmountInterface;
use YooKassa\Model\ConfirmationAttributes\ConfirmationAttributesFactory;
use YooKassa\Model\Deal\PaymentDealInfo;
+use YooKassa\Model\FraudData;
use YooKassa\Model\Payment;
use YooKassa\Model\PaymentData\AbstractPaymentData;
use YooKassa\Model\ConfirmationAttributes\AbstractConfirmationAttributes;
@@ -66,6 +67,8 @@ use YooKassa\Model\RecipientInterface;
* @property string $client_ip IPv4 или IPv6-адрес покупателя. Если не указан, используется IP-адрес TCP-подключения
* @property Metadata $metadata Метаданные привязанные к платежу
* @property PaymentDealInfo $deal Данные о сделке, в составе которой проходит платеж
+ * @property FraudData $fraudData Информация для проверки операции на мошенничество
+ * @property FraudData $fraud_data Информация для проверки операции на мошенничество
* @property string $merchantCustomerId Идентификатор покупателя в вашей системе, например электронная почта или номер телефона
* @property string $merchant_customer_id Идентификатор покупателя в вашей системе, например электронная почта или номер телефона
*/
@@ -133,6 +136,11 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
*/
private $_deal;
+ /**
+ * @var FraudData Информация для проверки операции на мошенничество
+ */
+ private $_fraud_data;
+
/**
* @var string Идентификатор покупателя в вашей системе, например электронная почта или номер телефона. Не более 200 символов.
* Присутствует, если вы хотите запомнить банковскую карту и отобразить ее при повторном платеже в виджете ЮKassa
@@ -190,7 +198,10 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'CreatePaymentRequest.description', $value
+ 'Invalid description value type',
+ 0,
+ 'CreatePaymentRequest.description',
+ $value
);
}
}
@@ -252,13 +263,19 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$length = mb_strlen((string)$value, 'utf-8');
if ($length > self::MAX_LENGTH_PAYMENT_TOKEN) {
throw new InvalidPropertyValueException(
- 'Invalid paymentToken value', 0, 'CreatePaymentRequest.paymentToken', $value
+ 'Invalid paymentToken value',
+ 0,
+ 'CreatePaymentRequest.paymentToken',
+ $value
);
}
$this->_paymentToken = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid paymentToken value type', 0, 'CreatePaymentRequest.paymentToken', $value
+ 'Invalid paymentToken value type',
+ 0,
+ 'CreatePaymentRequest.paymentToken',
+ $value
);
}
}
@@ -459,7 +476,10 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_capture = (bool)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid capture value type in CreatePaymentRequest', 0, 'CreatePaymentRequest.capture', $value
+ 'Invalid capture value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.capture',
+ $value
);
}
}
@@ -496,7 +516,10 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_clientIp = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid clientIp value type in CreatePaymentRequest', 0, 'CreatePaymentRequest.clientIp', $value
+ 'Invalid clientIp value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.clientIp',
+ $value
);
}
}
@@ -514,7 +537,7 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
* Проверяет, были ли установлены данные авиабилетов
* @return bool
*/
- function hasAirline()
+ public function hasAirline()
{
return $this->_airline !== null;
}
@@ -563,7 +586,10 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_metadata = new Metadata($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid metadata value type in CreatePaymentRequest', 0, 'CreatePaymentRequest.metadata', $value
+ 'Invalid metadata value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.metadata',
+ $value
);
}
}
@@ -602,11 +628,56 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_deal = new PaymentDealInfo($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal value type in CreatePaymentRequest', 0, 'CreatePaymentRequest.deal', $value
+ 'Invalid deal value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.deal',
+ $value
);
}
}
+ /**
+ * Возвращает информацию для проверки операции на мошенничество.
+ *
+ * @return FraudData|null Информация для проверки операции на мошенничество
+ */
+ public function getFraudData()
+ {
+ return $this->_fraud_data;
+ }
+
+ /**
+ * Устанавливает информацию для проверки операции на мошенничество.
+ *
+ * @param FraudData|array|null $value Информация для проверки операции на мошенничество
+ */
+ public function setFraudData($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_fraud_data = null;
+ } elseif ($value instanceof FraudData) {
+ $this->_fraud_data = $value;
+ } elseif (is_array($value)) {
+ $this->_fraud_data = new FraudData($value);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid fraud_data value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.fraud_data',
+ $value
+ );
+ }
+ }
+
+ /**
+ * Проверяет, была ли установлена информация для проверки операции на мошенничество
+ * @return bool True если информация была установлена, false если нет
+ */
+ public function hasFraudData()
+ {
+ return !empty($this->_fraud_data);
+ }
+
/**
* Возвращает идентификатор покупателя в вашей системе
* @return string Идентификатор покупателя в вашей системе
@@ -648,7 +719,10 @@ class CreatePaymentRequest extends AbstractPaymentRequest implements CreatePayme
$this->_merchant_customer_id = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid merchant_customer_id value type in CreatePaymentRequest', 0, 'CreatePaymentRequest.merchant_customer_id', $value
+ 'Invalid merchant_customer_id value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.merchant_customer_id',
+ $value
);
}
}
diff --git a/lib/Request/Payments/CreatePaymentRequestBuilder.php b/lib/Request/Payments/CreatePaymentRequestBuilder.php
index f480687a..8d7f96cb 100644
--- a/lib/Request/Payments/CreatePaymentRequestBuilder.php
+++ b/lib/Request/Payments/CreatePaymentRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,7 @@ use YooKassa\Model\AirlineInterface;
use YooKassa\Model\ConfirmationAttributes\AbstractConfirmationAttributes;
use YooKassa\Model\ConfirmationAttributes\ConfirmationAttributesFactory;
use YooKassa\Model\Deal\PaymentDealInfo;
+use YooKassa\Model\FraudData;
use YooKassa\Model\Metadata;
use YooKassa\Model\Payment;
use YooKassa\Model\PaymentData\AbstractPaymentData;
@@ -89,6 +90,12 @@ class CreatePaymentRequestBuilder extends AbstractPaymentRequestBuilder
*/
protected $deal;
+ /**
+ * Объект с информацией о сделке, в составе которой проходит платеж.
+ * @var FraudData
+ */
+ protected $fraud_data;
+
/**
* Инициализирует объект запроса, который в дальнейшем будет собираться билдером
* @return CreatePaymentRequest Инстанс собираемого объекта запроса к API
@@ -341,6 +348,34 @@ class CreatePaymentRequestBuilder extends AbstractPaymentRequestBuilder
return $this;
}
+ /**
+ * Устанавливает сделку
+ * @param FraudData|array|null $value Данные о сделке, в составе которой проходит платеж
+ * @throws InvalidPropertyValueTypeException
+ *
+ * @return CreatePaymentRequestBuilder Информация для проверки операции на мошенничество
+ */
+ public function setFraudData($value)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->fraud_data = null;
+ return $this;
+ }
+ if ($value instanceof FraudData) {
+ $this->fraud_data = $value;
+ } elseif (is_array($value)) {
+ $this->fraud_data = new FraudData($value);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid fraud_data value type in CreatePaymentRequest',
+ 0,
+ 'CreatePaymentRequest.fraud_data',
+ $value
+ );
+ }
+ return $this;
+ }
+
/**
* Устанавливает идентификатор покупателя в вашей системе
* @param string $value Идентификатор покупателя в вашей системе, например электронная почта или номер телефона. Не более 200 символов
@@ -411,7 +446,7 @@ class CreatePaymentRequestBuilder extends AbstractPaymentRequestBuilder
if ($this->receipt->notEmpty()) {
$this->currentObject->setReceipt($this->receipt);
}
- if($this->airline->notEmpty()){
+ if ($this->airline->notEmpty()) {
$this->currentObject->setAirline($this->airline);
}
$this->currentObject->setAmount($this->amount);
@@ -419,6 +454,9 @@ class CreatePaymentRequestBuilder extends AbstractPaymentRequestBuilder
if ($this->deal) {
$this->currentObject->setDeal($this->deal);
}
+ if ($this->fraud_data) {
+ $this->currentObject->setFraudData($this->fraud_data);
+ }
return parent::build();
}
diff --git a/lib/Request/Payments/CreatePaymentRequestInterface.php b/lib/Request/Payments/CreatePaymentRequestInterface.php
index 6cb93ab6..ad69ff15 100644
--- a/lib/Request/Payments/CreatePaymentRequestInterface.php
+++ b/lib/Request/Payments/CreatePaymentRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,7 @@ use YooKassa\Model\AirlineInterface;
use YooKassa\Model\AmountInterface;
use YooKassa\Model\ConfirmationAttributes\AbstractConfirmationAttributes;
use YooKassa\Model\Deal\PaymentDealInfo;
+use YooKassa\Model\FraudData;
use YooKassa\Model\Metadata;
use YooKassa\Model\PaymentData\AbstractPaymentData;
use YooKassa\Model\ReceiptInterface;
@@ -60,6 +61,8 @@ use YooKassa\Model\TransferInterface;
* @property-read Metadata $metadata Метаданные привязанные к платежу
* @property-read TransferInterface[] $transfers Метаданные привязанные к платежу
* @property-read PaymentDealInfo $deal Данные о сделке, в составе которой проходит платеж
+ * @property-read FraudData $fraudData Информация для проверки операции на мошенничество
+ * @property-read FraudData $fraud_data Информация для проверки операции на мошенничество
* @property-read string $merchantCustomerId Идентификатор покупателя в вашей системе, например электронная почта или номер телефона
* @property-read string $merchant_customer_id Идентификатор покупателя в вашей системе, например электронная почта или номер телефона
*/
@@ -69,223 +72,223 @@ interface CreatePaymentRequestInterface
* Возвращает объект получателя платежа
* @return RecipientInterface|null Объект с информацией о получателе платежа или null, если получатель не задан
*/
- function getRecipient();
+ public function getRecipient();
/**
* Проверяет наличие получателя платежа в запросе
* @return bool True если получатель платежа задан, false если нет
*/
- function hasRecipient();
+ public function hasRecipient();
/**
* Устанавливает объект с информацией о получателе платежа
* @param RecipientInterface|null $value Инстанс объекта информации о получателе платежа или null
*/
- function setRecipient($value);
+ public function setRecipient($value);
/**
* Возвращает сумму заказа
* @return AmountInterface Сумма заказа
*/
- function getAmount();
+ public function getAmount();
/**
* Возвращает описание транзакции
* @return string Описание транзакции
*/
- function getDescription();
+ public function getDescription();
/**
* Проверяет наличие описания транзакции в создаваемом платеже
* @return bool True если описание транзакции установлено, false если нет
*/
- function hasDescription();
+ public function hasDescription();
/**
* Устанавливает описание транзакции
* @param string $value Описание транзакции
*/
- function setDescription($value);
+ public function setDescription($value);
/**
* Возвращает чек, если он есть
* @return ReceiptInterface|null Данные фискального чека 54-ФЗ или null, если чека нет
*/
- function getReceipt();
+ public function getReceipt();
/**
* Проверяет наличие чека в создаваемом платеже
* @return bool True если чек есть, false если нет
*/
- function hasReceipt();
+ public function hasReceipt();
/**
* Возвращает одноразовый токен для проведения оплаты
* @return string Одноразовый токен для проведения оплаты, сформированный YooKassa JS widget
*/
- function getPaymentToken();
+ public function getPaymentToken();
/**
* Проверяет наличие одноразового токена для проведения оплаты
* @return bool True если токен установлен, false если нет
*/
- function hasPaymentToken();
+ public function hasPaymentToken();
/**
* Устанавливает одноразовый токен для проведения оплаты, сформированный YooKassa JS widget
* @param string $value Одноразовый токен для проведения оплаты
*/
- function setPaymentToken($value);
+ public function setPaymentToken($value);
/**
* Устанавливает идентификатор записи платёжных данных покупателя
* @return string Идентификатор записи о сохраненных платежных данных покупателя
*/
- function getPaymentMethodId();
+ public function getPaymentMethodId();
/**
* Проверяет наличие идентификатора записи о платёжных данных покупателя
* @return bool True если идентификатор задан, false если нет
*/
- function hasPaymentMethodId();
+ public function hasPaymentMethodId();
/**
* Устанавливает идентификатор записи о сохранённых данных покупателя
* @param string $value Идентификатор записи о сохраненных платежных данных покупателя
*/
- function setPaymentMethodId($value);
+ public function setPaymentMethodId($value);
/**
* Возвращает данные для создания метода оплаты
* @return AbstractPaymentData Данные используемые для создания метода оплаты
*/
- function getPaymentMethodData();
+ public function getPaymentMethodData();
/**
* Проверяет установлен ли объект с методом оплаты
* @return bool True если объект метода оплаты установлен, false если нет
*/
- function hasPaymentMethodData();
+ public function hasPaymentMethodData();
/**
* Устанавливает объект с информацией для создания метода оплаты
* @param AbstractPaymentData|null $value Объект создания метода оплаты или null
*/
- function setPaymentMethodData($value);
+ public function setPaymentMethodData($value);
/**
* Возвращает способ подтверждения платежа
* @return AbstractConfirmationAttributes Способ подтверждения платежа
*/
- function getConfirmation();
+ public function getConfirmation();
/**
* Проверяет, был ли установлен способ подтверждения платежа
* @return bool True если способ подтверждения платежа был установлен, false если нет
*/
- function hasConfirmation();
+ public function hasConfirmation();
/**
* Устанавливает способ подтверждения платежа
* @param AbstractConfirmationAttributes|null $value Способ подтверждения платежа
*/
- function setConfirmation($value);
+ public function setConfirmation($value);
/**
* Возвращает флаг сохранения платёжных данных
* @return bool Флаг сохранения платёжных данных
*/
- function getSavePaymentMethod();
+ public function getSavePaymentMethod();
/**
* Проверяет, был ли установлен флаг сохранения платёжных данных
* @return bool True если флыг был установлен, false если нет
*/
- function hasSavePaymentMethod();
+ public function hasSavePaymentMethod();
/**
* Устанавливает флаг сохранения платёжных данных. Значение true инициирует создание многоразового payment_method.
* @param bool $value Сохранить платежные данные для последующего использования
*/
- function setSavePaymentMethod($value);
+ public function setSavePaymentMethod($value);
/**
* Возвращает флаг автоматического принятия поступившей оплаты
* @return bool True если требуется автоматически принять поступившую оплату, false если нет
*/
- function getCapture();
+ public function getCapture();
/**
* Проверяет, был ли установлен флаг автоматического приняти поступившей оплаты
* @return bool True если флаг автоматического принятия оплаты был установлен, false если нет
*/
- function hasCapture();
+ public function hasCapture();
/**
* Устанавливает флаг автоматического принятия поступившей оплаты
* @param bool $value Автоматически принять поступившую оплату
*/
- function setCapture($value);
+ public function setCapture($value);
/**
* Возвращает IPv4 или IPv6-адрес покупателя
* @return string IPv4 или IPv6-адрес покупателя
*/
- function getClientIp();
+ public function getClientIp();
/**
* Проверяет, был ли установлен IPv4 или IPv6-адрес покупателя
* @return bool True если IP адрес покупателя был установлен, false если нет
*/
- function hasClientIp();
+ public function hasClientIp();
/**
* Устанавливает IP адрес покупателя
* @param string $value IPv4 или IPv6-адрес покупателя
*/
- function setClientIp($value);
+ public function setClientIp($value);
/**
* Возвращает данные оплаты установленные мерчантом
* @return Metadata Метаданные привязанные к платежу
*/
- function getMetadata();
+ public function getMetadata();
/**
* Проверяет, были ли установлены метаданные заказа
* @return bool True если метаданные были установлены, false если нет
*/
- function hasMetadata();
+ public function hasMetadata();
/**
* Устанавливает метаданные, привязанные к платежу
* @param Metadata|array|null $value Метаданные платежа, устанавливаемые мерчантом
*/
- function setMetadata($value);
+ public function setMetadata($value);
/**
* Возвращает данные длинной записи
* @return Airline
*/
- function getAirline();
+ public function getAirline();
/**
* Проверяет, были ли установлены данные длинной записи
* @return bool
*/
- function hasAirline();
+ public function hasAirline();
/**
* Устанавливает данные авиабилетов
* @param AirlineInterface $value Данные авиабилетов
*/
- function setAirline($value);
+ public function setAirline($value);
/**
* Проверяет наличие данных о распределении денег
* @return bool
*/
- function hasTransfers();
+ public function hasTransfers();
/**
* Возвращает данные о распределении денег — сколько и в какой магазин нужно перевести.
@@ -294,50 +297,68 @@ interface CreatePaymentRequestInterface
*
* @return TransferInterface[] Данные о распределении денег
*/
- function getTransfers();
+ public function getTransfers();
/**
* Устанавливает данные о распределении денег — сколько и в какой магазин нужно перевести.
* Присутствует, если вы используете решение ЮKassa для платформ.
* (https://yookassa.ru/developers/special-solutions/checkout-for-platforms/basics)
*
- * @param TransferInterface[]|array|null Данные о распределении денег
+ * @param TransferInterface[]|array|null $value Данные о распределении денег
*/
- function setTransfers($value);
+ public function setTransfers($value);
/**
* Возвращает данные о сделке, в составе которой проходит платеж
* @return PaymentDealInfo Данные о сделке, в составе которой проходит платеж.
*/
- function getDeal();
+ public function getDeal();
/**
* Проверяет, были ли установлены данные о сделке
* @return bool True если данные о сделке были установлены, false если нет
*/
- function hasDeal();
+ public function hasDeal();
/**
* Устанавливает данные о сделке, в составе которой проходит платеж.
* @param PaymentDealInfo|array|null $value Данные о сделке, в составе которой проходит платеж
*/
- function setDeal($value);
+ public function setDeal($value);
+
+ /**
+ * Возвращает информацию для проверки операции на мошенничество
+ * @return FraudData Информация для проверки операции на мошенничество
+ */
+ public function getFraudData();
+
+ /**
+ * Проверяет, была ли установлена информация для проверки операции на мошенничество
+ * @return bool True если информация была установлена, false если нет
+ */
+ public function hasFraudData();
+
+ /**
+ * Устанавливает информацию для проверки операции на мошенничество
+ * @param FraudData|array|null $value Информация для проверки операции на мошенничество
+ */
+ public function setFraudData($value);
/**
* Возвращает идентификатор покупателя в вашей системе
* @return string Идентификатор покупателя в вашей системе
*/
- function getMerchantCustomerId();
+ public function getMerchantCustomerId();
/**
* Проверяет, был ли установлен идентификатор покупателя в вашей системе
* @return bool True если идентификатор покупателя был установлен, false если нет
*/
- function hasMerchantCustomerId();
+ public function hasMerchantCustomerId();
/**
* Устанавливает идентификатор покупателя в вашей системе
* @param string $value Идентификатор покупателя в вашей системе, например электронная почта или номер телефона. Не более 200 символов
*/
- function setMerchantCustomerId($value);
+ public function setMerchantCustomerId($value);
}
diff --git a/lib/Request/Payments/CreatePaymentRequestSerializer.php b/lib/Request/Payments/CreatePaymentRequestSerializer.php
index 75787833..627d7900 100644
--- a/lib/Request/Payments/CreatePaymentRequestSerializer.php
+++ b/lib/Request/Payments/CreatePaymentRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -200,7 +200,7 @@ class CreatePaymentRequestSerializer
}
$customer = $receipt->getCustomer();
- if (!empty($customer)) {
+ if ($customer !== null) {
$result['customer'] = $customer->jsonSerialize();
}
diff --git a/lib/Request/Payments/CreatePaymentResponse.php b/lib/Request/Payments/CreatePaymentResponse.php
index 3a42e5dd..34b7c8fd 100644
--- a/lib/Request/Payments/CreatePaymentResponse.php
+++ b/lib/Request/Payments/CreatePaymentResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Payments;
* @package YooKassa
*/
class CreatePaymentResponse extends AbstractPaymentResponse
-{}
+{
+}
diff --git a/lib/Request/Payments/Payment/CancelResponse.php b/lib/Request/Payments/Payment/CancelResponse.php
index 487649e8..653f0e41 100644
--- a/lib/Request/Payments/Payment/CancelResponse.php
+++ b/lib/Request/Payments/Payment/CancelResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -34,4 +34,5 @@ use YooKassa\Request\Payments\AbstractPaymentResponse;
* @package YooKassa
*/
class CancelResponse extends AbstractPaymentResponse
-{}
+{
+}
diff --git a/lib/Request/Payments/Payment/CreateCaptureRequest.php b/lib/Request/Payments/Payment/CreateCaptureRequest.php
index 797bad69..b5524e63 100644
--- a/lib/Request/Payments/Payment/CreateCaptureRequest.php
+++ b/lib/Request/Payments/Payment/CreateCaptureRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -78,7 +78,10 @@ class CreateCaptureRequest extends AbstractPaymentRequest implements CreateCaptu
$this->_deal = new CaptureDealData($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal value type in CreateCaptureRequest', 0, 'CreateCaptureRequest.deal', $value
+ 'Invalid deal value type in CreateCaptureRequest',
+ 0,
+ 'CreateCaptureRequest.deal',
+ $value
);
}
}
diff --git a/lib/Request/Payments/Payment/CreateCaptureRequestBuilder.php b/lib/Request/Payments/Payment/CreateCaptureRequestBuilder.php
index 84f0e2d5..38694a75 100644
--- a/lib/Request/Payments/Payment/CreateCaptureRequestBuilder.php
+++ b/lib/Request/Payments/Payment/CreateCaptureRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Payments/Payment/CreateCaptureRequestInterface.php b/lib/Request/Payments/Payment/CreateCaptureRequestInterface.php
index c14f9ff8..e70f1b8a 100644
--- a/lib/Request/Payments/Payment/CreateCaptureRequestInterface.php
+++ b/lib/Request/Payments/Payment/CreateCaptureRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,74 +47,74 @@ interface CreateCaptureRequestInterface
* Возвращает подтверждаемую сумму оплаты
* @return AmountInterface Подтверждаемая сумма оплаты
*/
- function getAmount();
+ public function getAmount();
/**
* Проверяет, была ли установлена сумма оплаты
* @return bool True если сумма оплаты была установлена, false если нет
*/
- function hasAmount();
+ public function hasAmount();
/**
* Устанавливает сумму оплаты
* @param AmountInterface $value Сумма оплаты
*/
- function setAmount(AmountInterface $value);
+ public function setAmount(AmountInterface $value);
/**
* Возвращает чек, если он есть
* @return ReceiptInterface|null Данные фискального чека 54-ФЗ или null, если чека нет
* @since 1.0.2
*/
- function getReceipt();
+ public function getReceipt();
/**
* Проверяет наличие чека в создаваемом платеже
* @return bool True если чек есть, false если нет
* @since 1.0.2
*/
- function hasReceipt();
+ public function hasReceipt();
/**
* Устанавливает чек
* @param ReceiptInterface|null $value Инстанс чека или null для удаления информации о чеке
* @throws InvalidPropertyValueTypeException Выбрасывается если передан не инстанс класса чека и не null
*/
- function setReceipt($value);
+ public function setReceipt($value);
/**
* Проверяет наличие данных о распределении денег
* @return bool
*/
- function hasTransfers();
+ public function hasTransfers();
/**
* Возвращает данные о распределении денег
* @return TransferInterface[]
*/
- function getTransfers();
+ public function getTransfers();
/**
* Устанавливает transfers (массив распределения денег между магазинами)
* @param TransferInterface[]|array|null $value
*/
- function setTransfers($value);
+ public function setTransfers($value);
/**
* Проверяет наличие данных о сделке
* @return bool
*/
- function hasDeal();
+ public function hasDeal();
/**
* Возвращает данные о сделке
* @return PaymentDealInfo
*/
- function getDeal();
+ public function getDeal();
/**
* Устанавливает данные о сделке
* @param PaymentDealInfo|array|null $value
*/
- function setDeal($value);
+ public function setDeal($value);
}
diff --git a/lib/Request/Payments/Payment/CreateCaptureRequestSerializer.php b/lib/Request/Payments/Payment/CreateCaptureRequestSerializer.php
index c329da58..d436fa5d 100644
--- a/lib/Request/Payments/Payment/CreateCaptureRequestSerializer.php
+++ b/lib/Request/Payments/Payment/CreateCaptureRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Payments/Payment/CreateCaptureResponse.php b/lib/Request/Payments/Payment/CreateCaptureResponse.php
index 371c2b8c..4d056853 100644
--- a/lib/Request/Payments/Payment/CreateCaptureResponse.php
+++ b/lib/Request/Payments/Payment/CreateCaptureResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -34,4 +34,5 @@ use YooKassa\Request\Payments\AbstractPaymentResponse;
* @package YooKassa
*/
class CreateCaptureResponse extends AbstractPaymentResponse
-{}
+{
+}
diff --git a/lib/Request/Payments/PaymentResponse.php b/lib/Request/Payments/PaymentResponse.php
index 782fadeb..7d158c03 100644
--- a/lib/Request/Payments/PaymentResponse.php
+++ b/lib/Request/Payments/PaymentResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Payments;
* @package YooKassa
*/
class PaymentResponse extends AbstractPaymentResponse
-{}
+{
+}
diff --git a/lib/Request/Payments/PaymentsRequest.php b/lib/Request/Payments/PaymentsRequest.php
index f9c4a037..43489331 100644
--- a/lib/Request/Payments/PaymentsRequest.php
+++ b/lib/Request/Payments/PaymentsRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -150,13 +150,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtGte value in PaymentsRequest', 0, 'PaymentRequest.createdAtGte'
+ 'Invalid createdAtGte value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtGte'
);
}
$this->_createdAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtGte value type in PaymentsRequest', 0, 'PaymentRequest.createdAtGte'
+ 'Invalid createdAtGte value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtGte'
);
}
}
@@ -196,13 +200,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtGt value in PaymentsRequest', 0, 'PaymentRequest.createdAtGt'
+ 'Invalid createdAtGt value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtGt'
);
}
$this->_createdAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtGt value type in PaymentsRequest', 0, 'PaymentRequest.createdAtGt'
+ 'Invalid createdAtGt value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtGt'
);
}
}
@@ -242,13 +250,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtLte value in PaymentsRequest', 0, 'PaymentRequest.createdAtLte'
+ 'Invalid createdAtLte value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtLte'
);
}
$this->_createdAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAtLte value type in PaymentsRequest', 0, 'PaymentRequest.createdAtLte'
+ 'Invalid createdAtLte value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtLte'
);
}
}
@@ -288,13 +300,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid createdAtLt value in PaymentsRequest', 0, 'PaymentRequest.createdAtLt'
+ 'Invalid createdAtLt value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtLt'
);
}
$this->_createdAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid createdAlLt value type in PaymentsRequest', 0, 'PaymentRequest.createdAtLt'
+ 'Invalid createdAlLt value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.createdAtLt'
);
}
}
@@ -334,13 +350,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid capturedAtGte value in PaymentsRequest', 0, 'PaymentRequest.capturedAtGte'
+ 'Invalid capturedAtGte value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtGte'
);
}
$this->_capturedAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid capturedAtGte value type in PaymentsRequest', 0, 'PaymentRequest.capturedAtGte'
+ 'Invalid capturedAtGte value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtGte'
);
}
}
@@ -380,13 +400,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid capturedAtGt value in PaymentsRequest', 0, 'PaymentRequest.capturedAtGt'
+ 'Invalid capturedAtGt value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtGt'
);
}
$this->_capturedAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid capturedAtGt value type in PaymentsRequest', 0, 'PaymentRequest.capturedAtGt'
+ 'Invalid capturedAtGt value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtGt'
);
}
}
@@ -426,13 +450,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid capturedAtLte value in PaymentsRequest', 0, 'PaymentRequest.capturedAtLte'
+ 'Invalid capturedAtLte value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtLte'
);
}
$this->_capturedAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid capturedAtLte value type in PaymentsRequest', 0, 'PaymentRequest.capturedAtLte'
+ 'Invalid capturedAtLte value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtLte'
);
}
}
@@ -472,13 +500,17 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid capturedAtLt value in PaymentsRequest', 0, 'PaymentRequest.capturedAtLt'
+ 'Invalid capturedAtLt value in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtLt'
);
}
$this->_capturedAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid capturedAlLt value type in PaymentsRequest', 0, 'PaymentRequest.capturedAtLt'
+ 'Invalid capturedAlLt value type in PaymentsRequest',
+ 0,
+ 'PaymentRequest.capturedAtLt'
);
}
}
@@ -515,14 +547,20 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
} elseif (TypeCast::canCastToEnumString($value)) {
if (!PaymentStatus::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid status value in PaymentsRequest', 0, 'PaymentsRequest.status', $value
+ 'Invalid status value in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.status',
+ $value
);
} else {
$this->_status = (string)$value;
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value in PaymentsRequest', 0, 'PaymentsRequest.status', $value
+ 'Invalid status value in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.status',
+ $value
);
}
}
@@ -559,14 +597,20 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
} elseif (TypeCast::canCastToEnumString($value)) {
if (!PaymentMethodType::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid status value in PaymentsRequest', 0, 'PaymentsRequest.paymentMethod', $value
+ 'Invalid status value in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.paymentMethod',
+ $value
);
} else {
$this->_paymentMethod = (string)$value;
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in PaymentsRequest', 0, 'PaymentsRequest.paymentMethod', $value
+ 'Invalid status value type in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.paymentMethod',
+ $value
);
}
}
@@ -602,13 +646,19 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
} elseif (is_int($value)) {
if ($value < 0 || $value > self::MAX_LIMIT_VALUE) {
throw new InvalidPropertyValueException(
- 'Invalid limit value in PaymentsRequest', 0, 'PaymentsRequest.limit', $value
+ 'Invalid limit value in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.limit',
+ $value
);
}
$this->_limit = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid limit value type in PaymentsRequest', 0, 'PaymentsRequest.limit', $value
+ 'Invalid limit value type in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.limit',
+ $value
);
}
}
@@ -645,7 +695,10 @@ class PaymentsRequest extends AbstractRequest implements PaymentsRequestInterfac
$this->_cursor = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in PaymentsRequest', 0, 'PaymentsRequest.limit', $value
+ 'Invalid cursor value type in PaymentsRequest',
+ 0,
+ 'PaymentsRequest.cursor',
+ $value
);
}
}
diff --git a/lib/Request/Payments/PaymentsRequestBuilder.php b/lib/Request/Payments/PaymentsRequestBuilder.php
index 53f5511b..8dc23fe3 100644
--- a/lib/Request/Payments/PaymentsRequestBuilder.php
+++ b/lib/Request/Payments/PaymentsRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Payments/PaymentsRequestInterface.php b/lib/Request/Payments/PaymentsRequestInterface.php
index 8e3459ba..642de4c5 100644
--- a/lib/Request/Payments/PaymentsRequestInterface.php
+++ b/lib/Request/Payments/PaymentsRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,227 +50,227 @@ interface PaymentsRequestInterface
* Возвращает страницу выдачи результатов или null, если она до этого не была установлена
* @return string|null Страница выдачи результатов
*/
- function getCursor();
+ public function getCursor();
/**
* Проверяет, была ли установлена страница выдачи результатов
* @return bool True если страница выдачи результатов была установлена, false если нет
*/
- function hasCursor();
+ public function hasCursor();
/**
* Устанавливает страницу выдачи результатов
* @param string $value Страница
* @return void
*/
- function setCursor($value);
+ public function setCursor($value);
/**
* Возвращает ограничение количества объектов платежа или null, если оно до этого не было установлено
* @return string|null Ограничение количества объектов платежа
*/
- function getLimit();
+ public function getLimit();
/**
* Проверяет, было ли установлено ограничение количества объектов платежа
* @return bool True если ограничение количества объектов платежа было установлено, false если нет
*/
- function hasLimit();
+ public function hasLimit();
/**
* Устанавливает ограничение количества объектов платежа
* @param int $value Количества объектов платежа на странице
* @return void
*/
- function setLimit($value);
+ public function setLimit($value);
/**
* Возвращает дату создания от которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, от (включительно)
*/
- function getCreatedAtGte();
+ public function getCreatedAtGte();
/**
* Проверяет, была ли установлена дата создания от которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGte();
+ public function hasCreatedAtGte();
/**
* Устанавливает дату создания от которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtGte($value);
+ public function setCreatedAtGte($value);
/**
* Возвращает дату создания от которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, от (не включая)
*/
- function getCreatedAtGt();
+ public function getCreatedAtGt();
/**
* Проверяет, была ли установлена дата создания от которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGt();
+ public function hasCreatedAtGt();
/**
* Устанавливает дату создания от которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtGt($value);
+ public function setCreatedAtGt($value);
/**
* Возвращает дату создания до которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, до (включительно)
*/
- function getCreatedAtLte();
+ public function getCreatedAtLte();
/**
* Проверяет, была ли установлена дата создания до которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLte();
+ public function hasCreatedAtLte();
/**
* Устанавливает дату создания до которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtLte($value);
+ public function setCreatedAtLte($value);
/**
* Возвращает дату создания до которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, до (не включая)
*/
- function getCreatedAtLt();
+ public function getCreatedAtLt();
/**
* Проверяет, была ли установлена дата создания до которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLt();
+ public function hasCreatedAtLt();
/**
* Устанавливает дату создания до которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCreatedAtLt($value);
+ public function setCreatedAtLt($value);
/**
* Возвращает дату создания от которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, от (включительно)
*/
- function getCapturedAtGte();
+ public function getCapturedAtGte();
/**
* Проверяет, была ли установлена дата создания от которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCapturedAtGte();
+ public function hasCapturedAtGte();
/**
* Устанавливает дату создания от которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCapturedAtGte($value);
+ public function setCapturedAtGte($value);
/**
* Возвращает дату создания от которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, от (не включая)
*/
- function getCapturedAtGt();
+ public function getCapturedAtGt();
/**
* Проверяет, была ли установлена дата создания от которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCapturedAtGt();
+ public function hasCapturedAtGt();
/**
* Устанавливает дату создания от которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCapturedAtGt($value);
+ public function setCapturedAtGt($value);
/**
* Возвращает дату создания до которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, до (включительно)
*/
- function getCapturedAtLte();
+ public function getCapturedAtLte();
/**
* Проверяет, была ли установлена дата создания до которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCapturedAtLte();
+ public function hasCapturedAtLte();
/**
* Устанавливает дату создания до которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCapturedAtLte($value);
+ public function setCapturedAtLte($value);
/**
* Возвращает дату создания до которой будут возвращены платежи или null, если дата не была установлена
* @return \DateTime|null Время создания, до (не включая)
*/
- function getCapturedAtLt();
+ public function getCapturedAtLt();
/**
* Проверяет, была ли установлена дата создания до которой выбираются платежи
* @return bool True если дата была установлена, false если нет
*/
- function hasCapturedAtLt();
+ public function hasCapturedAtLt();
/**
* Устанавливает дату создания до которой выбираются платежи
* @param \DateTime $value Дата
* @return void
*/
- function setCapturedAtLt($value);
+ public function setCapturedAtLt($value);
/**
* Возвращает статус выбираемых платежей или null, если он до этого не был установлен
* @return string|null Статус выбираемых платежей
*/
- function getStatus();
+ public function getStatus();
/**
* Проверяет, был ли установлен статус выбираемых платежей
* @return bool True если статус был установлен, false если нет
*/
- function hasStatus();
+ public function hasStatus();
/**
* Устанавливает статус выбираемых платежей
* @param string $value Статус платежей
* @return void
*/
- function setStatus($value);
+ public function setStatus($value);
/**
* Возвращает код способа оплаты выбираемых платежей или null, если он до этого не был установлен
* @return string|null Код способа оплаты выбираемых платежей
*/
- function getPaymentMethod();
+ public function getPaymentMethod();
/**
* Проверяет, был ли установлен код способа оплаты выбираемых платежей
* @return bool True если код способа оплаты был установлен, false если нет
*/
- function hasPaymentMethod();
+ public function hasPaymentMethod();
/**
* Устанавливает код способа оплаты выбираемых платежей
* @param string $value Код способа оплаты
* @return void
*/
- function setPaymentMethod($value);
+ public function setPaymentMethod($value);
}
diff --git a/lib/Request/Payments/PaymentsRequestSerializer.php b/lib/Request/Payments/PaymentsRequestSerializer.php
index 1194a2b1..be35595f 100644
--- a/lib/Request/Payments/PaymentsRequestSerializer.php
+++ b/lib/Request/Payments/PaymentsRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Payments/PaymentsResponse.php b/lib/Request/Payments/PaymentsResponse.php
index 6cc3b9bf..a45b3f98 100644
--- a/lib/Request/Payments/PaymentsResponse.php
+++ b/lib/Request/Payments/PaymentsResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -90,5 +90,4 @@ class PaymentsResponse extends AbstractObject
{
return $this->nextCursor !== null;
}
-
}
diff --git a/lib/Request/Payouts/AbstractPayoutResponse.php b/lib/Request/Payouts/AbstractPayoutResponse.php
index 7340e2ed..5f0a764f 100644
--- a/lib/Request/Payouts/AbstractPayoutResponse.php
+++ b/lib/Request/Payouts/AbstractPayoutResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -34,5 +34,6 @@ use YooKassa\Model\PayoutInterface;
*
* @package YooKassa
*/
-abstract class AbstractPayoutResponse extends Payout implements PayoutInterface
-{}
+abstract class AbstractPayoutResponse extends Payout
+{
+}
diff --git a/lib/Request/Payouts/CreatePayoutRequest.php b/lib/Request/Payouts/CreatePayoutRequest.php
index ac77874d..5ea18c32 100644
--- a/lib/Request/Payouts/CreatePayoutRequest.php
+++ b/lib/Request/Payouts/CreatePayoutRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -52,8 +52,16 @@ use YooKassa\Request\Payouts\PayoutDestinationData\PayoutDestinationDataFactory;
* @property AbstractPayoutDestination $payout_destination_data Данные платежного средства, на которое нужно сделать выплату. Обязательный параметр, если не передан payout_token.
* @property string $payoutToken Токенизированные данные для выплаты. Например, синоним банковской карты. Обязательный параметр, если не передан payout_destination_data
* @property string $payout_token Токенизированные данные для выплаты. Например, синоним банковской карты. Обязательный параметр, если не передан payout_destination_data
+ * @property string $payment_method_id Идентификатор сохраненного способа оплаты, данные которого нужно использовать для проведения выплаты
+ * @property string $paymentMethodId Идентификатор сохраненного способа оплаты, данные которого нужно использовать для проведения выплаты
* @property PayoutDealInfo $deal Сделка, в рамках которой нужно провести выплату. Необходимо передавать, если вы проводите Безопасную сделку
* @property string $description Описание транзакции (не более 128 символов). Например: «Выплата по договору N»
+ * @property PayoutSelfEmployedInfo $self_employed Данные самозанятого, который получит выплату. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property PayoutSelfEmployedInfo $selfEmployed Данные самозанятого, который получит выплату. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property IncomeReceiptData $receipt_data Данные для формирования чека в сервисе Мой налог. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property IncomeReceiptData $receiptData Данные для формирования чека в сервисе Мой налог. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property PayoutPersonalData $personal_data Персональные данные получателя выплаты. Необходимо передавать, если вы делаете выплаты с [проверкой получателя](/developers/payouts/scenario-extensions/recipient-check) (только для выплат через СБП).
+ * @property PayoutPersonalData $personalData Персональные данные получателя выплаты. Необходимо передавать, если вы делаете выплаты с [проверкой получателя](/developers/payouts/scenario-extensions/recipient-check) (только для выплат через СБП).
* @property Metadata $metadata Метаданные привязанные к выплате
*/
class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequestInterface
@@ -66,13 +74,24 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
/**
* @var AbstractPayoutDestination Данные платежного средства, на которое нужно сделать выплату
*/
- private $_payoutDestinationData;
+ private $_payout_destination_data;
/**
* @var string Токенизированные данные для выплаты
*/
private $_payoutToken;
+ /**
+ * Идентификатор сохраненного способа оплаты, данные которого нужно использовать для проведения выплаты.
+ *
+ * [Подробнее о выплатах с использованием идентификатора сохраненного способа оплаты](https://yookassa.ru/developers/payouts/scenario-extensions/multipurpose-token)
+ *
+ * Обязательный параметр, если не передан payout_destination_data или payout_token.
+ *
+ * @var string|null
+ */
+ private $_payment_method_id;
+
/**
* @var PayoutDealInfo Сделка, в рамках которой нужно провести выплату
*/
@@ -83,6 +102,27 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
*/
private $_description;
+ /**
+ * Данные самозанятого, который получит выплату. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ *
+ * @var PayoutSelfEmployedInfo|null
+ */
+ private $_self_employed;
+
+ /**
+ * Данные для формирования чека в сервисе Мой налог. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ *
+ * @var IncomeReceiptData|null
+ */
+ private $_receipt_data;
+
+ /**
+ * Персональные данные получателя выплаты. Необходимо передавать, если вы делаете выплаты с [проверкой получателя](/developers/payouts/scenario-extensions/recipient-check) (только для выплат через СБП).
+ *
+ * @var PayoutPersonalData[]|null
+ */
+ private $_personal_data;
+
/**
* @var Metadata Метаданные привязанные к выплате
*/
@@ -108,7 +148,7 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
/**
* Устанавливает сумму выплаты
- * @param AmountInterface|array|string|null Сумма выплаты
+ * @param AmountInterface|array|string|numeric|null $value Сумма выплаты
*
* @throws InvalidPropertyValueTypeException Выбрасывается если был передан объект невалидного типа
*/
@@ -116,13 +156,18 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException('Empty amount value', 0, 'CreatePayoutRequest.amount');
- } elseif ($value instanceof AmountInterface) {
+ }
+ if ($value instanceof AmountInterface) {
$this->_amount = $value;
} elseif (is_numeric($value) || is_array($value)) {
$this->_amount = new MonetaryAmount($value);
} else {
throw new InvalidPropertyValueTypeException('Invalid amount value type in CreatePayoutRequest', 0, 'CreatePayoutRequest.amount', $value);
}
+ $value = $this->_amount->getValue();
+ if (empty($value) || $value <= 0.0) {
+ throw new InvalidPropertyValueException('Invalid amount value in CreatePayoutRequest', 0, 'CreatePayoutRequest.amount', $value);
+ }
}
/**
@@ -131,7 +176,7 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
*/
public function getPayoutDestinationData()
{
- return $this->_payoutDestinationData;
+ return $this->_payout_destination_data;
}
/**
@@ -140,7 +185,7 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
*/
public function hasPayoutDestinationData()
{
- return !empty($this->_payoutDestinationData);
+ return !empty($this->_payout_destination_data);
}
/**
@@ -152,12 +197,12 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
public function setPayoutDestinationData($value)
{
if ($value === null || $value === '') {
- $this->_payoutDestinationData = null;
+ $this->_payout_destination_data = null;
} elseif ($value instanceof AbstractPayoutDestinationData) {
- $this->_payoutDestinationData = $value;
+ $this->_payout_destination_data = $value;
} elseif (is_array($value)) {
$factory = new PayoutDestinationDataFactory();
- $this->_payoutDestinationData = $factory->factoryFromArray($value);
+ $this->_payout_destination_data = $factory->factoryFromArray($value);
} else {
throw new InvalidPropertyValueTypeException(
'Invalid payoutDestinationData value type in CreatePayoutRequest',
@@ -169,8 +214,8 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
}
/**
- * Проверяет наличие токенизированных данных для выплаты
- * @return bool True если токен установлен, false если нет
+ * Возвращает токенизированные данные для выплаты
+ * @return string Токенизированные данные для выплаты
*/
public function getPayoutToken()
{
@@ -178,7 +223,7 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
}
/**
- * Проверяет наличие одноразового токена для проведения оплаты
+ * Проверяет наличие токенизированных данных для выплаты
* @return bool True если токен установлен, false если нет
*/
public function hasPayoutToken()
@@ -200,11 +245,58 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
$this->_payoutToken = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payoutToken value type', 0, 'CreatePayoutRequest.payoutToken', $value
+ 'Invalid payoutToken value type',
+ 0,
+ 'CreatePayoutRequest.payoutToken',
+ $value
);
}
}
+ /**
+ * Возвращает идентификатор сохраненного способа оплаты.
+ *
+ * @return string|null Идентификатор сохраненного способа оплаты
+ */
+ public function getPaymentMethodId()
+ {
+ return $this->_payment_method_id;
+ }
+
+ /**
+ * Проверяет наличие идентификатора сохраненного способа оплаты
+ * @return bool True если идентификатора установлен, false если нет
+ */
+ public function hasPaymentMethodId()
+ {
+ return !empty($this->_payment_method_id);
+ }
+
+ /**
+ * Устанавливает идентификатор сохраненного способа оплаты.
+ *
+ * @param string|null $value Идентификатор сохраненного способа оплаты
+ *
+ * @return $this
+ */
+ public function setPaymentMethodId($value = null)
+ {
+ if ($value === null || $value === '') {
+ $this->_payment_method_id = null;
+ } elseif (TypeCast::canCastToString($value)) {
+ $this->_payment_method_id = (string)$value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid payment_method_id value type',
+ 0,
+ 'CreatePayoutRequest.payment_method_id',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
/**
* Возвращает сделку, в рамках которой нужно провести выплату
* @return PayoutDealInfo Сделка, в рамках которой нужно провести выплату
@@ -237,12 +329,164 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
$this->_deal = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid value type for "deal" parameter in CreatePayoutRequest', 0, 'CreatePayoutRequest.deal', $value
+ 'Invalid value type for "deal" parameter in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.deal',
+ $value
);
}
return $this;
}
+ /**
+ * Возвращает данные самозанятого, который получит выплату.
+ *
+ * @return PayoutSelfEmployedInfo|null Данные самозанятого, который получит выплату
+ */
+ public function getSelfEmployed()
+ {
+ return $this->_self_employed;
+ }
+ /**
+ * Проверяет наличие данных самозанятого в создаваемой выплате
+ * @return bool True если данные самозанятого есть, false если нет
+ */
+ public function hasSelfEmployed()
+ {
+ return !empty($this->_self_employed);
+ }
+
+ /**
+ * Устанавливает данные самозанятого, который получит выплату.
+ *
+ * @param PayoutSelfEmployedInfo|array|null $value Данные самозанятого, который получит выплату
+ *
+ * @return $this
+ */
+ public function setSelfEmployed($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_self_employed = null;
+ } elseif (is_array($value)) {
+ $this->_self_employed = new PayoutSelfEmployedInfo($value);
+ } elseif ($value instanceof PayoutSelfEmployedInfo) {
+ $this->_self_employed = $value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "self_employed" parameter in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.self_employed',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает данные для формирования чека в сервисе Мой налог.
+ *
+ * @return IncomeReceiptData|null Данные для формирования чека в сервисе Мой налог
+ */
+ public function getReceiptData()
+ {
+ return $this->_receipt_data;
+ }
+
+ /**
+ * Проверяет наличие данных для формирования чека в сервисе Мой налог.
+ * @return bool True если данные для формирования чека есть, false если нет
+ */
+ public function hasReceiptData()
+ {
+ return !empty($this->_receipt_data);
+ }
+
+ /**
+ * Устанавливает данные для формирования чека в сервисе Мой налог.
+ *
+ * @param IncomeReceiptData|array|null $value Данные для формирования чека в сервисе Мой налог
+ *
+ * @return $this
+ */
+ public function setReceiptData($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_receipt_data = null;
+ } elseif (is_array($value)) {
+ $this->_receipt_data = new IncomeReceiptData($value);
+ } elseif ($value instanceof IncomeReceiptData) {
+ $this->_receipt_data = $value;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "receipt_data" parameter in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.receipt_data',
+ $value
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Возвращает персональные данные получателя выплаты.
+ *
+ * @return PayoutPersonalData[]|null Персональные данные получателя выплаты
+ */
+ public function getPersonalData()
+ {
+ return $this->_personal_data;
+ }
+
+ /**
+ * Проверяет наличие персональных данных в создаваемой выплате
+ * @return bool True если персональные данные есть, false если нет
+ */
+ public function hasPersonalData()
+ {
+ return !empty($this->_personal_data);
+ }
+
+ /**
+ * Устанавливает персональные данные получателя выплаты.
+ *
+ * @param PayoutPersonalData[]|array|null $value Персональные данные получателя выплаты
+ *
+ * @return $this
+ */
+ public function setPersonalData($value = null)
+ {
+ if ($value === null || (is_array($value) && empty($value))) {
+ $this->_personal_data = null;
+ return $this;
+ }
+ if (!is_array($value) && !($value instanceof \Traversable)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid personal_data value type in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.personal_data',
+ $value
+ );
+ }
+ $this->_personal_data = array();
+ foreach ($value as $key => $val) {
+ if ($val instanceof PayoutPersonalData) {
+ $this->_personal_data[] = $val;
+ } elseif (is_array($val)) {
+ $this->_personal_data[] = new PayoutPersonalData($val);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid personal_data value type in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.personal_data[' . $key . ']',
+ $val
+ );
+ }
+ }
+
+ return $this;
+ }
/**
* Возвращает описание транзакции
@@ -286,7 +530,10 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type', 0, 'CreatePayoutRequest.description', $value
+ 'Invalid description value type',
+ 0,
+ 'CreatePayoutRequest.description',
+ $value
);
}
}
@@ -326,7 +573,10 @@ class CreatePayoutRequest extends AbstractRequest implements CreatePayoutRequest
$this->_metadata = new Metadata($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid metadata value type in CreatePayoutRequest', 0, 'CreatePayoutRequest.metadata', $value
+ 'Invalid metadata value type in CreatePayoutRequest',
+ 0,
+ 'CreatePayoutRequest.metadata',
+ $value
);
}
}
diff --git a/lib/Request/Payouts/CreatePayoutRequestBuilder.php b/lib/Request/Payouts/CreatePayoutRequestBuilder.php
index dbf508ce..8a3d348e 100644
--- a/lib/Request/Payouts/CreatePayoutRequestBuilder.php
+++ b/lib/Request/Payouts/CreatePayoutRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -100,6 +100,19 @@ class CreatePayoutRequestBuilder extends AbstractRequestBuilder
return $this;
}
+ /**
+ * Устанавливает идентификатор сохраненного способа оплаты.
+ *
+ * @param string|null $value Идентификатор сохраненного способа оплаты
+ *
+ * @throws InvalidPropertyValueTypeException Выбрасывается если был передан объект невалидного типа
+ */
+ public function setPaymentMethodId($value)
+ {
+ $this->currentObject->setPaymentMethodId($value);
+ return $this;
+ }
+
/**
* Устанавливает сделку, в рамках которой нужно провести выплату
* @param PayoutDealInfo|array $value Сделка, в рамках которой нужно провести выплату
@@ -112,6 +125,45 @@ class CreatePayoutRequestBuilder extends AbstractRequestBuilder
return $this;
}
+ /**
+ * Устанавливает данные самозанятого, который получит выплату.
+ *
+ * @param PayoutSelfEmployedInfo|array|null $value Данные самозанятого, который получит выплату
+ *
+ * @throws InvalidPropertyValueTypeException Выбрасывается если был передан объект невалидного типа
+ */
+ public function setSelfEmployed($value)
+ {
+ $this->currentObject->setSelfEmployed($value);
+ return $this;
+ }
+
+ /**
+ * Устанавливает данные для формирования чека в сервисе Мой налог.
+ *
+ * @param IncomeReceiptData|array|null $value Данные для формирования чека в сервисе Мой налог
+ *
+ * @throws InvalidPropertyValueTypeException Выбрасывается если был передан объект невалидного типа
+ */
+ public function setReceiptData($value)
+ {
+ $this->currentObject->setReceiptData($value);
+ return $this;
+ }
+
+ /**
+ * Устанавливает персональные данные получателя выплаты.
+ *
+ * @param PayoutPersonalData[]|array|null $value Персональные данные получателя выплаты
+ *
+ * @throws InvalidPropertyValueTypeException Выбрасывается если был передан объект невалидного типа
+ */
+ public function setPersonalData($value)
+ {
+ $this->currentObject->setPersonalData($value);
+ return $this;
+ }
+
/**
* Устанавливает метаданные, привязанные к платежу
* @param Metadata|array|null $value Метаданные платежа, устанавливаемые мерчантом
@@ -151,5 +203,4 @@ class CreatePayoutRequestBuilder extends AbstractRequestBuilder
{
return parent::build($options);
}
-
}
diff --git a/lib/Request/Payouts/CreatePayoutRequestInterface.php b/lib/Request/Payouts/CreatePayoutRequestInterface.php
index 99bc3a57..dd0e468d 100644
--- a/lib/Request/Payouts/CreatePayoutRequestInterface.php
+++ b/lib/Request/Payouts/CreatePayoutRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@
namespace YooKassa\Request\Payouts;
use YooKassa\Model\AmountInterface;
-use YooKassa\Model\DealInterface;
use YooKassa\Model\Metadata;
use YooKassa\Model\MonetaryAmount;
use YooKassa\Model\Deal\PayoutDealInfo;
@@ -43,8 +42,16 @@ use YooKassa\Model\Payout\AbstractPayoutDestination;
* @property AbstractPayoutDestination $payout_destination_data Данные платежного средства, на которое нужно сделать выплату. Обязательный параметр, если не передан payout_token.
* @property string $payoutToken Токенизированные данные для выплаты. Например, синоним банковской карты. Обязательный параметр, если не передан payout_destination_data
* @property string $payout_token Токенизированные данные для выплаты. Например, синоним банковской карты. Обязательный параметр, если не передан payout_destination_data
- * @property DealInterface $deal Сделка, в рамках которой нужно провести выплату. Необходимо передавать, если вы проводите Безопасную сделку
+ * @property string $payment_method_id Идентификатор сохраненного способа оплаты, данные которого нужно использовать для проведения выплаты
+ * @property string $paymentMethodId Идентификатор сохраненного способа оплаты, данные которого нужно использовать для проведения выплаты
+ * @property PayoutDealInfo $deal Сделка, в рамках которой нужно провести выплату. Необходимо передавать, если вы проводите Безопасную сделку
* @property string $description Описание транзакции (не более 128 символов). Например: «Выплата по договору N»
+ * @property PayoutSelfEmployedInfo $self_employed Данные самозанятого, который получит выплату. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property PayoutSelfEmployedInfo $selfEmployed Данные самозанятого, который получит выплату. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property IncomeReceiptData $receipt_data Данные для формирования чека в сервисе Мой налог. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property IncomeReceiptData $receiptData Данные для формирования чека в сервисе Мой налог. Необходимо передавать, если вы делаете выплату [самозанятому](https://yookassa.ru/developers/payouts/scenario-extensions/self-employed). Только для обычных выплат.
+ * @property PayoutPersonalData $personal_data Персональные данные получателя выплаты. Необходимо передавать, если вы делаете выплаты с [проверкой получателя](/developers/payouts/scenario-extensions/recipient-check) (только для выплат через СБП).
+ * @property PayoutPersonalData $personalData Персональные данные получателя выплаты. Необходимо передавать, если вы делаете выплаты с [проверкой получателя](/developers/payouts/scenario-extensions/recipient-check) (только для выплат через СБП).
* @property Metadata $metadata Метаданные привязанные к выплате
*/
interface CreatePayoutRequestInterface
@@ -53,107 +60,195 @@ interface CreatePayoutRequestInterface
* Возвращает сумму выплаты
* @return AmountInterface|MonetaryAmount Сумма выплаты
*/
- function getAmount();
+ public function getAmount();
/**
* Проверяет наличие суммы в создаваемой выплате
* @return bool True если сумма установлена, false если нет
*/
- function hasAmount();
+ public function hasAmount();
/**
* Устанавливает сумму выплаты
- * @param AmountInterface|array Сумма выплаты
+ * @param AmountInterface|array $value Сумма выплаты
*/
- function setAmount($value);
+ public function setAmount($value);
/**
* Возвращает данные платежного средства, на которое нужно сделать выплату
* @return AbstractPayoutDestination|null Данные платежного средства, на которое нужно сделать выплату
*/
- function getPayoutDestinationData();
+ public function getPayoutDestinationData();
/**
* Проверяет наличие данных платежного средства, на которое нужно сделать выплату
* @return bool True если данные есть, false если нет
*/
- function hasPayoutDestinationData();
+ public function hasPayoutDestinationData();
/**
* Устанавливает данные платежного средства, на которое нужно сделать выплату
* @param AbstractPayoutDestination|array|null $value Данные платежного средства, на которое нужно сделать выплату
*/
- function setPayoutDestinationData($value);
+ public function setPayoutDestinationData($value);
/**
* Возвращает токенизированные данные для выплаты
* @return string Токенизированные данные для выплаты
*/
- function getPayoutToken();
+ public function getPayoutToken();
/**
* Проверяет наличие токенизированных данных для выплаты
* @return bool True если токен установлен, false если нет
*/
- function hasPayoutToken();
+ public function hasPayoutToken();
/**
* Устанавливает токенизированные данные для выплаты
* @param string $value Токенизированные данные для выплаты
*/
- function setPayoutToken($value);
+ public function setPayoutToken($value);
+
+ /**
+ * Возвращает идентификатор сохраненного способа оплаты.
+ *
+ * @return string|null Идентификатор сохраненного способа оплаты
+ */
+ public function getPaymentMethodId();
+
+ /**
+ * Проверяет наличие идентификатора сохраненного способа оплаты
+ * @return bool True если идентификатора установлен, false если нет
+ */
+ public function hasPaymentMethodId();
+
+ /**
+ * Устанавливает идентификатор сохраненного способа оплаты.
+ *
+ * @param string|null $value Идентификатор сохраненного способа оплаты
+ *
+ * @return $this
+ */
+ public function setPaymentMethodId($value = null);
/**
* Возвращает описание транзакции
* @return string Описание транзакции
*/
- function getDescription();
+ public function getDescription();
/**
* Проверяет наличие описания транзакции в создаваемой выплате
* @return bool True если описание транзакции установлено, false если нет
*/
- function hasDescription();
+ public function hasDescription();
/**
* Устанавливает описание транзакции
* @param string $value Описание транзакции
*/
- function setDescription($value);
+ public function setDescription($value);
/**
* Возвращает сделку, в рамках которой нужно провести выплату
* @return PayoutDealInfo|null Сделка, в рамках которой нужно провести выплату
*/
- function getDeal();
+ public function getDeal();
/**
* Проверяет установлена ли сделка, в рамках которой нужно провести выплату
* @return bool True если сделка установлена, false если нет
*/
- function hasDeal();
+ public function hasDeal();
/**
* Устанавливает сделку, в рамках которой нужно провести выплату
* @param PayoutDealInfo|array|null $value Сделка, в рамках которой нужно провести выплату
*/
- function setDeal($value);
+ public function setDeal($value);
+
+ /**
+ * Возвращает данные самозанятого, который получит выплату.
+ *
+ * @return PayoutSelfEmployedInfo|null Данные самозанятого, который получит выплату
+ */
+ public function getSelfEmployed();
+
+ /**
+ * Проверяет наличие данных самозанятого в создаваемой выплате
+ * @return bool True если данные самозанятого есть, false если нет
+ */
+ public function hasSelfEmployed();
+
+ /**
+ * Устанавливает данные самозанятого, который получит выплату.
+ *
+ * @param PayoutSelfEmployedInfo|array|null $value Данные самозанятого, который получит выплату
+ *
+ * @return $this
+ */
+ public function setSelfEmployed($value = null);
+
+ /**
+ * Возвращает данные для формирования чека в сервисе Мой налог.
+ *
+ * @return IncomeReceiptData|null Данные для формирования чека в сервисе Мой налог
+ */
+ public function getReceiptData();
+
+ /**
+ * Проверяет наличие данных для формирования чека в сервисе Мой налог.
+ * @return bool True если данные для формирования чека есть, false если нет
+ */
+ public function hasReceiptData();
+
+ /**
+ * Устанавливает данные для формирования чека в сервисе Мой налог..
+ *
+ * @param IncomeReceiptData|array|null $value Данные для формирования чека в сервисе Мой налог.
+ *
+ * @return $this
+ */
+ public function setReceiptData($value = null);
+
+ /**
+ * Возвращает персональные данные получателя выплаты.
+ *
+ * @return PayoutPersonalData[]|null Персональные данные получателя выплаты
+ */
+ public function getPersonalData();
+
+ /**
+ * Проверяет наличие персональных данных в создаваемой выплате
+ * @return bool True если персональные данные есть, false если нет
+ */
+ public function hasPersonalData();
+
+ /**
+ * Устанавливает персональные данные получателя выплаты.
+ *
+ * @param PayoutPersonalData[]|array|null $value Персональные данные получателя выплаты
+ *
+ * @return $this
+ */
+ public function setPersonalData($value = null);
/**
* Возвращает данные оплаты установленные мерчантом
* @return Metadata Метаданные привязанные к выплате
*/
- function getMetadata();
+ public function getMetadata();
/**
* Проверяет, были ли установлены метаданные заказа
* @return bool True если метаданные были установлены, false если нет
*/
- function hasMetadata();
+ public function hasMetadata();
/**
* Устанавливает метаданные, привязанные к выплате
* @param Metadata|array|null $value Метаданные платежа, устанавливаемые мерчантом
*/
- function setMetadata($value);
+ public function setMetadata($value);
}
diff --git a/lib/Request/Payouts/CreatePayoutRequestSerializer.php b/lib/Request/Payouts/CreatePayoutRequestSerializer.php
index 4b0fdec3..d69e17e0 100644
--- a/lib/Request/Payouts/CreatePayoutRequestSerializer.php
+++ b/lib/Request/Payouts/CreatePayoutRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,13 +47,13 @@ class CreatePayoutRequestSerializer
$result['amount'] = $request->getAmount()->toArray();
}
if ($request->hasPayoutDestinationData()) {
- $result['payout_destination_data'] = $request->getPayoutDestinationData()->toArray();
+ $result['payout_destination_data'] = $request->getPayoutDestinationdata()->toArray();
}
if ($request->hasPayoutToken()) {
$result['payout_token'] = $request->getPayoutToken();
}
- if ($request->hasMetadata()) {
- $result['metadata'] = $request->getMetadata()->toArray();
+ if ($request->hasPaymentMethodid()) {
+ $result['payment_method_id'] = $request->getPaymentMethodid();
}
if ($request->hasDescription()) {
$result['description'] = $request->getDescription();
@@ -61,6 +61,17 @@ class CreatePayoutRequestSerializer
if ($request->hasDeal()) {
$result['deal'] = $request->getDeal()->toArray();
}
+ if ($request->hasSelfEmployed()) {
+ $result['self_employed'] = $request->getSelfEmployed()->toArray();
+ }
+ if ($request->hasReceiptData()) {
+ $result['receipt_data'] = $request->getReceiptData()->toArray();
+ }
+ if ($request->hasPersonalData()) {
+ foreach ($request->getPersonalData() as $item) {
+ $result['personal_data'][] = $item->toArray();
+ }
+ }
if ($request->hasMetadata()) {
$result['metadata'] = $request->getMetadata()->toArray();
}
diff --git a/lib/Request/Payouts/CreatePayoutResponse.php b/lib/Request/Payouts/CreatePayoutResponse.php
index c02f4d39..c2298f79 100644
--- a/lib/Request/Payouts/CreatePayoutResponse.php
+++ b/lib/Request/Payouts/CreatePayoutResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Payouts;
* @package YooKassa
*/
class CreatePayoutResponse extends AbstractPayoutResponse
-{}
+{
+}
diff --git a/lib/Request/Payouts/IncomeReceiptData.php b/lib/Request/Payouts/IncomeReceiptData.php
new file mode 100644
index 00000000..6376f676
--- /dev/null
+++ b/lib/Request/Payouts/IncomeReceiptData.php
@@ -0,0 +1,138 @@
+_service_name;
+ }
+
+ /**
+ * Устанавливает описание услуги, оказанной получателем выплаты.
+ *
+ * @param string $value Описание услуги, оказанной получателем выплаты
+ *
+ * @return $this
+ */
+ public function setServiceName($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException('Empty service_name value', 0, 'IncomeReceiptData.service_name');
+ }
+ if (!TypeCast::canCastToString($value)) {
+ throw new InvalidPropertyValueTypeException('Invalid IncomeReceiptData service_name value type', 0, 'IncomeReceiptData.id', $value);
+ }
+ if (mb_strlen($value, 'utf-8') > IncomeReceipt::MAX_LENGTH_SERVICE_NAME) {
+ throw new InvalidPropertyValueException('Invalid IncomeReceiptData service_name value', 0, 'IncomeReceiptData.service_name', $value);
+ }
+ $this->_service_name = (string)$value;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает сумму для печати в чеке.
+ *
+ * @return AmountInterface|null Сумма для печати в чеке
+ */
+ public function getAmount()
+ {
+ return $this->_amount;
+ }
+
+ /**
+ * Устанавливает сумму для печати в чеке.
+ *
+ * @param AmountInterface|array|null $value Сумма для печати в чеке
+ *
+ * @return $this
+ */
+ public function setAmount($value = null)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException('Empty amount value', 0, 'IncomeReceiptData.amount');
+ }
+ if ($value instanceof AmountInterface) {
+ $this->_amount = $value;
+ } elseif (is_array($value)) {
+ $this->_amount = new MonetaryAmount($value);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid IncomeReceiptData.amount value type',
+ 0,
+ 'IncomeReceiptData.amount',
+ $value
+ );
+ }
+
+ return $this;
+ }
+}
diff --git a/lib/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationData.php b/lib/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationData.php
index d48299e7..8c20dec7 100644
--- a/lib/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationData.php
+++ b/lib/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationData.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,4 +33,5 @@ use YooKassa\Model\Payout\AbstractPayoutDestination;
* @property string $type Тип метода оплаты
*/
abstract class AbstractPayoutDestinationData extends AbstractPayoutDestination
-{}
+{
+}
diff --git a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCard.php b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCard.php
index a2afe2ff..eca104e4 100644
--- a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCard.php
+++ b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@ class PayoutDestinationDataBankCard extends AbstractPayoutDestinationData
public function __construct()
{
- $this->_setType(PaymentMethodType::BANK_CARD);
+ $this->setType(PaymentMethodType::BANK_CARD);
}
/**
@@ -75,7 +75,10 @@ class PayoutDestinationDataBankCard extends AbstractPayoutDestinationData
$this->_card = $card;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card value type in PayoutDestinationBankCard', 0, 'PayoutDestinationBankCard.card', $value
+ 'Invalid card value type in PayoutDestinationBankCard',
+ 0,
+ 'PayoutDestinationBankCard.card',
+ $value
);
}
}
diff --git a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardCard.php b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardCard.php
index e07b862d..c823b94e 100644
--- a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardCard.php
+++ b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardCard.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -67,14 +67,19 @@ class PayoutDestinationDataBankCardCard extends AbstractObject
$this->_number = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid card number value', 0, 'PayoutDestinationBankCardCard.number', $value
+ 'Invalid card number value',
+ 0,
+ 'PayoutDestinationBankCardCard.number',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid card number value type', 0, 'PayoutDestinationBankCardCard.number', $value
+ 'Invalid card number value type',
+ 0,
+ 'PayoutDestinationBankCardCard.number',
+ $value
);
}
}
-
}
diff --git a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactory.php b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactory.php
index 201df32a..0f6f0af4 100644
--- a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactory.php
+++ b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -38,8 +38,9 @@ use YooKassa\Model\PaymentMethodType;
class PayoutDestinationDataFactory
{
private $typeClassMap = array(
- PaymentMethodType::YOO_MONEY => 'PayoutDestinationDataYooMoney',
- PaymentMethodType::BANK_CARD => 'PayoutDestinationDataBankCard',
+ PaymentMethodType::YOO_MONEY => 'PayoutDestinationDataYooMoney',
+ PaymentMethodType::BANK_CARD => 'PayoutDestinationDataBankCard',
+ PaymentMethodType::SBP => 'PayoutDestinationDataSbp',
);
/**
@@ -54,9 +55,9 @@ class PayoutDestinationDataFactory
throw new \InvalidArgumentException('Invalid payment type value in payment factory');
}
if (!array_key_exists($type, $this->typeClassMap)) {
- throw new \InvalidArgumentException('Invalid payment data type "'.$type.'"');
+ throw new \InvalidArgumentException('Invalid payment data type "' . $type . '"');
}
- $className = __NAMESPACE__.'\\'.$this->typeClassMap[$type];
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
return new $className();
}
diff --git a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbp.php b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbp.php
new file mode 100644
index 00000000..a268b60b
--- /dev/null
+++ b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbp.php
@@ -0,0 +1,133 @@
+setType(PaymentMethodType::SBP);
+ }
+
+ /**
+ * Возвращает телефон, к которому привязан счет получателя выплаты в системе участника СБП.
+ *
+ * @return string Телефон, к которому привязан счет получателя выплаты в системе участника СБП
+ */
+ public function getPhone()
+ {
+ return $this->_phone;
+ }
+
+ /**
+ * Устанавливает телефон, к которому привязан счет получателя выплаты в системе участника СБП.
+ *
+ * @param string $phone Телефон, к которому привязан счет получателя выплаты в системе участника СБП
+ *
+ * @return $this
+ */
+ public function setPhone($phone)
+ {
+ if ($phone === null || $phone === '') {
+ throw new EmptyPropertyValueException('Empty phone value', 0, 'PayoutDestinationDataSbp.phone');
+ }
+ if (!TypeCast::canCastToString($phone)) {
+ throw new InvalidPropertyValueTypeException('Invalid phone value type', 0, 'PayoutDestinationDataSbp.phone');
+ }
+ $this->_phone = (string)preg_replace('/\D/', '', $phone);
+
+ return $this;
+ }
+
+ /**
+ * Возвращает идентификатор выбранного участника СБП.
+ *
+ * @return string Идентификатор выбранного участника СБП
+ */
+ public function getBankId()
+ {
+ return $this->_bank_id;
+ }
+
+ /**
+ * Устанавливает идентификатор выбранного участника СБП.
+ *
+ * @param string $bankId Идентификатор выбранного участника СБП
+ *
+ * @return $this
+ */
+ public function setBankId($bankId)
+ {
+ if ($bankId === null || $bankId === '') {
+ throw new EmptyPropertyValueException('Empty bank_id value', 0, 'PayoutDestinationDataSbp.bank_id');
+ }
+ if (!TypeCast::canCastToString($bankId)) {
+ throw new InvalidPropertyValueTypeException('Invalid bank_id value type', 0, 'PayoutDestinationDataSbp.bank_id', $bankId);
+ }
+ if (mb_strlen($bankId) > 12) {
+ throw new InvalidPropertyValueException('Invalid bank_id value', 0, 'PayoutDestinationDataSbp.bank_id', $bankId);
+ }
+ $this->_bank_id = (string)$bankId;
+
+ return $this;
+ }
+}
diff --git a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoney.php b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoney.php
index 4e0161bd..7d8445fa 100644
--- a/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoney.php
+++ b/lib/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoney.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -50,7 +50,7 @@ class PayoutDestinationDataYooMoney extends AbstractPayoutDestinationData
public function __construct()
{
- $this->_setType(PaymentMethodType::YOO_MONEY);
+ $this->setType(PaymentMethodType::YOO_MONEY);
}
/**
@@ -70,19 +70,27 @@ class PayoutDestinationDataYooMoney extends AbstractPayoutDestinationData
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty accountNumber value', 0, 'PayoutDestinationYooMoney.accountNumber'
+ 'Empty accountNumber value',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber'
);
} elseif (TypeCast::canCastToString($value)) {
if (preg_match('/^[0-9]{11,33}$/', $value)) {
$this->_accountNumber = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid accountNumber value', 0, 'PayoutDestinationYooMoney.accountNumber', $value
+ 'Invalid accountNumber value',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid accountNumber value type', 0, 'PayoutDestinationYooMoney.accountNumber', $value
+ 'Invalid accountNumber value type',
+ 0,
+ 'PayoutDestinationYooMoney.accountNumber',
+ $value
);
}
}
diff --git a/lib/Request/Payouts/PayoutPersonalData.php b/lib/Request/Payouts/PayoutPersonalData.php
new file mode 100644
index 00000000..84a8f8e1
--- /dev/null
+++ b/lib/Request/Payouts/PayoutPersonalData.php
@@ -0,0 +1,84 @@
+_id;
+ }
+
+ /**
+ * Устанавливает идентификатор персональных данных.
+ *
+ * @param string $id Идентификатор персональных данных
+ *
+ * @return $this
+ */
+ public function setId($id)
+ {
+ if (!TypeCast::canCastToString($id)) {
+ throw new InvalidPropertyValueTypeException('Invalid PayoutPersonalData id value type', 0, 'PayoutPersonalData.id', $id);
+ }
+ $length = mb_strlen($id, 'utf-8');
+ if ($length < PersonalDataInterface::MIN_LENGTH_ID || $length > PersonalDataInterface::MAX_LENGTH_ID) {
+ throw new InvalidPropertyValueException('Invalid PayoutPersonalData id value', 0, 'PayoutPersonalData.id', $id);
+ }
+ $this->_id = (string)$id;
+
+ return $this;
+ }
+}
diff --git a/lib/Request/Payouts/PayoutResponse.php b/lib/Request/Payouts/PayoutResponse.php
index 938bc055..6f155ef9 100644
--- a/lib/Request/Payouts/PayoutResponse.php
+++ b/lib/Request/Payouts/PayoutResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Payouts;
* @package YooKassa
*/
class PayoutResponse extends AbstractPayoutResponse
-{}
+{
+}
diff --git a/lib/Request/Payouts/PayoutSelfEmployedInfo.php b/lib/Request/Payouts/PayoutSelfEmployedInfo.php
new file mode 100644
index 00000000..54f786b8
--- /dev/null
+++ b/lib/Request/Payouts/PayoutSelfEmployedInfo.php
@@ -0,0 +1,84 @@
+_id;
+ }
+
+ /**
+ * Устанавливает идентификатор самозанятого.
+ *
+ * @param string $id Идентификатор самозанятого в ЮKassa.
+ *
+ * @return $this
+ */
+ public function setId($id)
+ {
+ if (!TypeCast::canCastToString($id)) {
+ throw new InvalidPropertyValueTypeException('Invalid PayoutSelfEmployedInfo id value type', 0, 'PayoutSelfEmployedInfo.id', $id);
+ }
+ $length = mb_strlen($id, 'utf-8');
+ if ($length < SelfEmployedInterface::MIN_LENGTH_ID || $length > SelfEmployedInterface::MAX_LENGTH_ID) {
+ throw new InvalidPropertyValueException('Invalid PayoutSelfEmployedInfo id value', 0, 'PayoutSelfEmployedInfo.id', $id);
+ }
+ $this->_id = (string)$id;
+
+ return $this;
+ }
+}
diff --git a/lib/Request/Payouts/SbpBanksResponse.php b/lib/Request/Payouts/SbpBanksResponse.php
new file mode 100644
index 00000000..9e764547
--- /dev/null
+++ b/lib/Request/Payouts/SbpBanksResponse.php
@@ -0,0 +1,104 @@
+_items = array();
+ foreach ($sourceArray['items'] as $paymentInfo) {
+ $this->_items[] = new SbpParticipantBank($paymentInfo);
+ }
+ }
+
+ /**
+ * Возвращает type.
+ *
+ * @return string
+ */
+ public function getType()
+ {
+ return $this->_type;
+ }
+
+ /**
+ * Устанавливает type.
+ *
+ * @param string $type Формат выдачи результатов запроса. Возможное значение: `list` (список).
+ *
+ * @return $this
+ */
+ public function setType($type)
+ {
+ $this->_type = $type;
+
+ return $this;
+ }
+
+ /**
+ * Возвращает items.
+ *
+ * @return SbpParticipantBank[]|array
+ */
+ public function getItems()
+ {
+ return $this->_items;
+ }
+}
diff --git a/lib/Request/PersonalData/CreatePersonalDataRequest.php b/lib/Request/PersonalData/CreatePersonalDataRequest.php
new file mode 100644
index 00000000..30a311a9
--- /dev/null
+++ b/lib/Request/PersonalData/CreatePersonalDataRequest.php
@@ -0,0 +1,378 @@
+_type;
+ }
+
+ /**
+ * Устанавливает тип персональных данных.
+ *
+ * @param string $type Тип персональных данных
+ *
+ * @return $this
+ */
+ public function setType($type)
+ {
+ if (!TypeCast::canCastToEnumString($type)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid PersonalData type value type',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.type',
+ $type
+ );
+ }
+ if (!PersonalDataType::valueExists((string)$type)) {
+ throw new InvalidPropertyValueException('Invalid PersonalData type value', 0, 'SbpPayoutRecipientPersonalDataRequest.type', $type);
+ }
+ $this->_type = (string)$type;
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие типа персональных данных в запросе
+ * @return bool True если тип персональных данных задан, false если нет
+ */
+ public function hasType()
+ {
+ return !empty($this->_type);
+ }
+
+ /**
+ * Возвращает фамилию пользователя.
+ *
+ * @return string Фамилия пользователя
+ */
+ public function getLastName()
+ {
+ return $this->_last_name;
+ }
+
+ /**
+ * Устанавливает фамилию пользователя.
+ *
+ * @param string $last_name Фамилия пользователя.
+ *
+ * @return $this
+ */
+ public function setLastName($last_name)
+ {
+ if ($last_name === null || $last_name === '') {
+ throw new InvalidPropertyValueException(
+ 'The value of the description parameter is empty',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.last_name',
+ $last_name
+ );
+ }
+ if (!TypeCast::canCastToString($last_name)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid last_name value type',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.last_name',
+ $last_name
+ );
+ }
+ $length = mb_strlen((string)$last_name, 'utf-8');
+ if ($length > self::MAX_LENGTH_LAST_NAME) {
+ throw new InvalidPropertyValueException(
+ 'The value of the last_name parameter is too long. Max length is ' . self::MAX_LENGTH_LAST_NAME,
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.last_name',
+ $last_name
+ );
+ }
+ $this->_last_name = (string)$last_name;
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие фамилии пользователя в запросе
+ * @return bool True если фамилия пользователя задана, false если нет
+ */
+ public function hasLastName()
+ {
+ return !empty($this->_last_name);
+ }
+
+ /**
+ * Возвращает имя пользователя.
+ *
+ * @return string Имя пользователя
+ */
+ public function getFirstName()
+ {
+ return $this->_first_name;
+ }
+
+ /**
+ * Устанавливает имя пользователя.
+ *
+ * @param string $first_name Имя пользователя.
+ *
+ * @return $this
+ */
+ public function setFirstName($first_name)
+ {
+ if ($first_name === null || $first_name === '') {
+ throw new InvalidPropertyValueException(
+ 'The value of the description parameter is empty',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.first_name',
+ $first_name
+ );
+ }
+ if (!TypeCast::canCastToString($first_name)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid first_name value type',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.first_name',
+ $first_name
+ );
+ }
+ $length = mb_strlen((string)$first_name, 'utf-8');
+ if ($length > self::MAX_LENGTH_FIRST_NAME) {
+ throw new InvalidPropertyValueException(
+ 'The value of the first_name parameter is too long. Max length is ' . self::MAX_LENGTH_FIRST_NAME,
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.first_name',
+ $first_name
+ );
+ }
+ $this->_first_name = (string)$first_name;
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие имени пользователя в запросе
+ * @return bool True если имя пользователя задано, false если нет
+ */
+ public function hasFirstName()
+ {
+ return !empty($this->_first_name);
+ }
+
+ /**
+ * Возвращает отчество пользователя.
+ *
+ * @return string|null Отчество пользователя
+ */
+ public function getMiddleName()
+ {
+ return $this->_middle_name;
+ }
+
+ /**
+ * Устанавливает отчество пользователя.
+ *
+ * @param string|null $middle_name Отчество пользователя
+ *
+ * @return $this
+ */
+ public function setMiddleName($middle_name = null)
+ {
+ if ($middle_name === null || $middle_name === '') {
+ $this->_middle_name = null;
+ return $this;
+ }
+ if (!TypeCast::canCastToString($middle_name)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid middle_name value type',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.middle_name',
+ $middle_name
+ );
+ }
+ $length = mb_strlen((string)$middle_name, 'utf-8');
+ if ($length > self::MAX_LENGTH_LAST_NAME) {
+ throw new InvalidPropertyValueException(
+ 'The value of the middle_name parameter is too long. Max length is ' . self::MAX_LENGTH_LAST_NAME,
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.middle_name',
+ $middle_name
+ );
+ }
+ $this->_middle_name = (string)$middle_name;
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие отчества пользователя в запросе
+ * @return bool True если отчество пользователя задано, false если нет
+ */
+ public function hasMiddleName()
+ {
+ return !empty($this->_middle_name);
+ }
+
+ /**
+ * Возвращает метаданные.
+ *
+ * @return Metadata Метаданные
+ */
+ public function getMetadata()
+ {
+ return $this->_metadata;
+ }
+
+ /**
+ * Устанавливает метаданные.
+ *
+ * @param Metadata|array|null $metadata Метаданные
+ *
+ * @return $this
+ */
+ public function setMetadata($metadata = null)
+ {
+ if ($metadata === null || (is_array($metadata) && empty($metadata))) {
+ $this->_metadata = null;
+ } elseif ($metadata instanceof Metadata) {
+ $this->_metadata = $metadata;
+ } elseif (is_array($metadata)) {
+ $this->_metadata = new Metadata($metadata);
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid metadata value type',
+ 0,
+ 'SbpPayoutRecipientPersonalDataRequest.metadata',
+ $metadata
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Проверяет, были ли установлены метаданные
+ * @return bool True если метаданные были установлены, false если нет
+ */
+ public function hasMetadata()
+ {
+ return !empty($this->_metadata) && $this->_metadata->count() > 0;
+ }
+
+ /**
+ * Проверяет на валидность текущий объект
+ * @return bool True если объект запроса валиден, false если нет
+ */
+ public function validate()
+ {
+ if (!$this->hasType()) {
+ $this->setValidationError('PersonalData type not specified');
+ return false;
+ }
+ if (!$this->hasLastName()) {
+ $this->setValidationError('PersonalData last_name not specified');
+ return false;
+ }
+ if (!$this->hasFirstName()) {
+ $this->setValidationError('PersonalData first_name not specified');
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Возвращает билдер объектов запросов создания платежа
+ * @return CreatePersonalDataRequestBuilder Инстанс билдера объектов запросов
+ */
+ public static function builder()
+ {
+ return new CreatePersonalDataRequestBuilder();
+ }
+}
diff --git a/lib/Request/PersonalData/CreatePersonalDataRequestBuilder.php b/lib/Request/PersonalData/CreatePersonalDataRequestBuilder.php
new file mode 100644
index 00000000..e467b910
--- /dev/null
+++ b/lib/Request/PersonalData/CreatePersonalDataRequestBuilder.php
@@ -0,0 +1,145 @@
+currentObject->setType($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает фамилию пользователя.
+ *
+ * @param string $value Фамилия пользователя.
+ *
+ * @return self
+ */
+ public function setLastName($value)
+ {
+ $this->currentObject->setLastName($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает имя пользователя.
+ *
+ * @param string $value Имя пользователя.
+ *
+ * @return self
+ */
+ public function setFirstName($value)
+ {
+ $this->currentObject->setFirstName($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает отчество пользователя.
+ *
+ * @param string $value Отчество пользователя.
+ *
+ * @return self
+ */
+ public function setMiddleName($value)
+ {
+ $this->currentObject->setMiddleName($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает метаданные, привязанные к платежу
+ * @param Metadata|array|null $value Метаданные платежа, устанавливаемые мерчантом
+ * @return CreatePersonalDataRequestBuilder Инстанс текущего билдера
+ *
+ * @throws InvalidPropertyValueTypeException Выбрасывается если переданные данные не удалось интерпретировать как
+ * метаданные платежа
+ */
+ public function setMetadata($value)
+ {
+ $this->currentObject->setMetadata($value);
+ return $this;
+ }
+
+ /**
+ * Строит и возвращает объект запроса для отправки в API ЮKassa
+ * @param array|null $options Массив параметров для установки в объект запроса
+ * @return CreatePersonalDataRequestInterface|CreatePersonalDataRequest|AbstractRequest Инстанс объекта запроса
+ *
+ * @throws InvalidRequestException Выбрасывается если собрать объект запроса не удалось
+ */
+ public function build(array $options = null)
+ {
+ return parent::build($options);
+ }
+}
diff --git a/lib/Request/PersonalData/CreatePersonalDataRequestInterface.php b/lib/Request/PersonalData/CreatePersonalDataRequestInterface.php
new file mode 100644
index 00000000..ff81dded
--- /dev/null
+++ b/lib/Request/PersonalData/CreatePersonalDataRequestInterface.php
@@ -0,0 +1,160 @@
+hasType()) {
+ $result['type'] = $request->getType();
+ }
+ if ($request->hasLastName()) {
+ $result['last_name'] = $request->getLastName();
+ }
+ if ($request->hasFirstName()) {
+ $result['first_name'] = $request->getFirstName();
+ }
+ if ($request->hasMiddleName()) {
+ $result['first_name'] = $request->getMiddleName();
+ }
+ if ($request->hasMetadata()) {
+ $result['metadata'] = $request->getMetadata()->toArray();
+ }
+
+ return $result;
+ }
+}
diff --git a/lib/Request/PersonalData/PersonalDataResponse.php b/lib/Request/PersonalData/PersonalDataResponse.php
new file mode 100644
index 00000000..da452acc
--- /dev/null
+++ b/lib/Request/PersonalData/PersonalDataResponse.php
@@ -0,0 +1,42 @@
+_type = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid receipt type value type', 0, 'Receipt.type', $value
+ 'Invalid receipt type value type',
+ 0,
+ 'Receipt.type',
+ $value
);
}
}
@@ -273,12 +276,18 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
$this->_status = (string)$value;
} else {
throw new InvalidPropertyValueException(
- 'Invalid status value', 0, 'Receipt.status', $value
+ 'Invalid status value',
+ 0,
+ 'Receipt.status',
+ $value
);
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type', 0, 'Receipt.status', $value
+ 'Invalid status value type',
+ 0,
+ 'Receipt.status',
+ $value
);
}
return $this;
@@ -305,7 +314,10 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
$this->_fiscalDocumentNumber = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid fiscal_document_number value type', 0, 'Receipt.fiscalDocumentNumber', $value
+ 'Invalid fiscal_document_number value type',
+ 0,
+ 'Receipt.fiscalDocumentNumber',
+ $value
);
} else {
$this->_fiscalDocumentNumber = (string)$value;
@@ -414,7 +426,10 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid items value type in receipt', 0, 'receipt.items', $value
+ 'Invalid items value type in receipt',
+ 0,
+ 'receipt.items',
+ $value
);
}
$this->_items = array();
@@ -425,7 +440,10 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
$this->addItem($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid item value type in receipt', 0, 'receipt.items[' . $key . ']', $val
+ 'Invalid item value type in receipt',
+ 0,
+ 'receipt.items[' . $key . ']',
+ $val
);
}
}
@@ -463,7 +481,10 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in receipt', 0, 'receipt.settlements', $value
+ 'Invalid settlements value type in receipt',
+ 0,
+ 'receipt.settlements',
+ $value
);
}
$this->_settlements = array();
@@ -474,7 +495,10 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlement value type in receipt', 0, 'receipt.settlements['.$key.']', $val
+ 'Invalid settlement value type in receipt',
+ 0,
+ 'receipt.settlements[' . $key . ']',
+ $val
);
}
}
@@ -515,13 +539,17 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
$this->_taxSystemCode = null;
} elseif (!is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid tax_system_code value type', 0, 'receipt.taxSystemCode'
+ 'Invalid tax_system_code value type',
+ 0,
+ 'receipt.taxSystemCode'
);
} else {
$castedValue = (int)$value;
if ($castedValue < 1 || $castedValue > 6) {
throw new InvalidPropertyValueException(
- 'Invalid tax_system_code value: ' . $value, 0, 'receipt.taxSystemCode'
+ 'Invalid tax_system_code value: ' . $value,
+ 0,
+ 'receipt.taxSystemCode'
);
}
$this->_taxSystemCode = $castedValue;
@@ -631,11 +659,16 @@ abstract class AbstractReceiptResponse extends AbstractObject implements Receipt
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty onBehalfOf value', 0, 'Receipt.onBehalfOf'
+ 'Empty onBehalfOf value',
+ 0,
+ 'Receipt.onBehalfOf'
);
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid onBehalfOf value type', 0, 'Receipt.onBehalfOf', $value
+ 'Invalid onBehalfOf value type',
+ 0,
+ 'Receipt.onBehalfOf',
+ $value
);
} else {
$this->_onBehalfOf = (string)$value;
diff --git a/lib/Request/Receipts/CreatePostReceiptRequest.php b/lib/Request/Receipts/CreatePostReceiptRequest.php
index ea968620..d906ad2f 100644
--- a/lib/Request/Receipts/CreatePostReceiptRequest.php
+++ b/lib/Request/Receipts/CreatePostReceiptRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Request\Receipts;
-
use YooKassa\Common\AbstractRequest;
use YooKassa\Common\Exceptions\EmptyPropertyValueException;
use YooKassa\Common\Exceptions\InvalidPropertyValueException;
@@ -73,7 +72,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
/** @var OperationalDetails Операционный реквизит чека */
private $_receiptOperationalDetails;
- /** @var ReceiptItemInterface[] Список товаров в заказе */
+ /** @var ReceiptItemInterface[] Список товаров в заказе. Для чеков по 54-ФЗ можно передать не более 100 товаров, для чеков самозанятых — не более шести. */
private $_items = array();
/** @var SettlementInterface[] Список платежей */
@@ -111,10 +110,12 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает Id объекта чека
*
* @param string $value Id объекта чека
+ * @return CreatePostReceiptRequest
*/
public function setObjectId($value)
{
$this->_object_id = $value;
+ return $this;
}
/**
@@ -131,10 +132,12 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает тип объекта чека
*
* @param string $value Тип объекта чека
+ * @return CreatePostReceiptRequest
*/
public function setObjectType($value)
{
$this->_object_type = $value;
+ return $this;
}
/**
@@ -161,6 +164,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает информацию о плательщике
*
* @param ReceiptCustomerInterface|array $value Информация о плательщике
+ * @return CreatePostReceiptRequest
*/
public function setCustomer($value)
{
@@ -170,9 +174,13 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
$this->_customer = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid customer value type in receipt', 0, 'Receipt.customer', $value
+ 'Invalid customer value type in receipt',
+ 0,
+ 'Receipt.customer',
+ $value
);
}
+ return $this;
}
/**
@@ -206,7 +214,10 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid items value type in receipt', 0, 'Receipt.items', $value
+ 'Invalid items value type in receipt',
+ 0,
+ 'Receipt.items',
+ $value
);
}
$this->_items = array();
@@ -217,7 +228,10 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
$this->addItem($item);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid item value type in receipt', 0, 'Receipt.items['.$key.']', $item
+ 'Invalid item value type in receipt',
+ 0,
+ 'Receipt.items[' . $key . ']',
+ $item
);
}
}
@@ -260,19 +274,26 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException('Empty taxSystemCode value in receipt', 0, 'Receipt.taxSystemCode');
- } elseif (!is_numeric($value)) {
- throw new InvalidPropertyValueTypeException(
- 'Invalid taxSystemCode value type', 0, 'Receipt.taxSystemCode'
- );
- } else {
- $castedValue = (int)$value;
- if ($castedValue < 1 || $castedValue > 6) {
- throw new InvalidPropertyValueException(
- 'Invalid taxSystemCode value: '.$value, 0, 'Receipt.taxSystemCode'
- );
- }
- $this->_taxSystemCode = $castedValue;
}
+ if (!is_numeric($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid taxSystemCode value type',
+ 0,
+ 'Receipt.taxSystemCode'
+ );
+ }
+
+ $castedValue = (int)$value;
+ if ($castedValue < 1 || $castedValue > 6) {
+ throw new InvalidPropertyValueException(
+ 'Invalid taxSystemCode value: ' . $value,
+ 0,
+ 'Receipt.taxSystemCode'
+ );
+ }
+ $this->_taxSystemCode = $castedValue;
+
+ return $this;
}
/**
@@ -289,6 +310,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает дополнительный реквизит пользователя
*
* @param AdditionalUserProps|array $value Дополнительный реквизит пользователя
+ * @return void|CreatePostReceiptRequest
*/
public function setAdditionalUserProps($value)
{
@@ -302,9 +324,13 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
$this->_additionalUserProps = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid additionalUserProps value type in receipt', 0, 'Receipt.additional_user_props', $value
+ 'Invalid additionalUserProps value type in receipt',
+ 0,
+ 'Receipt.additional_user_props',
+ $value
);
}
+ return $this;
}
/**
@@ -318,15 +344,15 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
/**
* Устанавливает отраслевой реквизит чека
- * @param array|IndustryDetails[] $value Отраслевой реквизит чека
+ * @param array|IndustryDetails $value Отраслевой реквизит чека
*
- * @throws InvalidPropertyValueTypeException Выбрасывается если переданный аргумент - не массив
+ * @return CreatePostReceiptRequest
*/
public function setReceiptIndustryDetails($value)
{
if (empty($value)) {
$this->_receiptIndustryDetails = null;
- return;
+ return $this;
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
@@ -353,6 +379,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
}
}
$this->_receiptIndustryDetails = $details;
+ return $this;
}
/**
@@ -368,13 +395,13 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает операционный реквизит чека
* @param array|OperationalDetails $value Операционный реквизит чека
*
- * @throws InvalidPropertyValueTypeException Выбрасывается если переданный аргумент - не массив
+ * @return CreatePostReceiptRequest
*/
public function setReceiptOperationalDetails($value)
{
if (empty($value)) {
$this->_receiptOperationalDetails = null;
- return;
+ return $this;
}
if (!is_array($value) && !($value instanceof OperationalDetails)) {
throw new InvalidPropertyValueTypeException(
@@ -390,6 +417,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
}
$this->_receiptOperationalDetails = $value;
+ return $this;
}
/**
@@ -406,6 +434,7 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Устанавливает тип чека в онлайн-кассе
*
* @param string $value Тип чека в онлайн-кассе: приход "payment" или возврат "refund".
+ * @return CreatePostReceiptRequest
*/
public function setType($value)
{
@@ -419,9 +448,13 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid receipt type value type', 0, 'Receipt.type', $value
+ 'Invalid receipt type value type',
+ 0,
+ 'Receipt.type',
+ $value
);
}
+ return $this;
}
/**
@@ -437,16 +470,22 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
/**
* Устанавливает признак отложенной отправки чека.
* @param bool $value Признак отложенной отправки чека.
+ * @return CreatePostReceiptRequest
*/
public function setSend($value)
{
- if (TypeCast::canCastToBoolean($value)) {
- $this->_send = (bool)$value;
- } else {
+ if (!TypeCast::canCastToBoolean($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid receipt type value send', 0, 'Receipt.send', $value
+ 'Invalid receipt type value send',
+ 0,
+ 'Receipt.send',
+ $value
);
}
+
+ $this->_send = (bool)$value;
+
+ return $this;
}
/**
@@ -462,7 +501,8 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
/**
* Устанавливает массив оплат, обеспечивающих выдачу товара.
*
- * @param SettlementInterface[]|array $value Массив оплат, обеспечивающих выдачу товара.
+ * @param SettlementInterface|array $value Массив оплат, обеспечивающих выдачу товара.
+ * @return CreatePostReceiptRequest
*/
public function setSettlements($value)
{
@@ -471,7 +511,10 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
}
if (!is_array($value) && !($value instanceof \Traversable)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlements value type in receipt', 0, 'Receipt.settlements', $value
+ 'Invalid settlements value type in receipt',
+ 0,
+ 'Receipt.settlements',
+ $value
);
}
$this->_settlements = array();
@@ -482,10 +525,14 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
$this->addSettlement($val);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid settlement value type in receipt', 0, 'Receipt.settlements['.$key.']', $val
+ 'Invalid settlement value type in receipt',
+ 0,
+ 'Receipt.settlements[' . $key . ']',
+ $val
);
}
}
+ return $this;
}
/**
@@ -516,20 +563,29 @@ class CreatePostReceiptRequest extends AbstractRequest implements CreatePostRece
* Необходимо передавать, если вы используете решение ЮKassa для платформ.
*
* @param string $value
+ * @return CreatePostReceiptRequest
*/
public function setOnBehalfOf($value)
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty onBehalfOf value', 0, 'Receipt.onBehalfOf'
+ 'Empty onBehalfOf value',
+ 0,
+ 'Receipt.onBehalfOf'
);
- } elseif (!TypeCast::canCastToString($value)) {
- throw new InvalidPropertyValueTypeException(
- 'Invalid onBehalfOf value type', 0, 'Receipt.onBehalfOf', $value
- );
- } else {
- $this->_onBehalfOf = (string)$value;
}
+ if (!TypeCast::canCastToString($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid onBehalfOf value type',
+ 0,
+ 'Receipt.onBehalfOf',
+ $value
+ );
+ }
+
+ $this->_onBehalfOf = (string)$value;
+
+ return $this;
}
/**
diff --git a/lib/Request/Receipts/CreatePostReceiptRequestBuilder.php b/lib/Request/Receipts/CreatePostReceiptRequestBuilder.php
index 749aa843..1693be73 100644
--- a/lib/Request/Receipts/CreatePostReceiptRequestBuilder.php
+++ b/lib/Request/Receipts/CreatePostReceiptRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Request\Receipts;
-
use YooKassa\Common\AbstractPaymentRequestBuilder;
use YooKassa\Common\AbstractRequest;
use YooKassa\Common\AbstractRequestBuilder;
diff --git a/lib/Request/Receipts/CreatePostReceiptRequestInterface.php b/lib/Request/Receipts/CreatePostReceiptRequestInterface.php
index 9bd482d2..0f405e07 100644
--- a/lib/Request/Receipts/CreatePostReceiptRequestInterface.php
+++ b/lib/Request/Receipts/CreatePostReceiptRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -88,6 +88,21 @@ interface CreatePostReceiptRequestInterface
*/
public function setType($value);
+ /**
+ * Возвращает тип объекта чека
+ *
+ * @return string Тип объекта чека
+ */
+ public function getObjectType();
+
+ /**
+ * Устанавливает тип объекта чека
+ *
+ * @param string $value Тип объекта чека
+ * @return CreatePostReceiptRequestInterface
+ */
+ public function setObjectType($value);
+
/**
* Возвращает признак отложенной отправки чека
*
diff --git a/lib/Request/Receipts/CreatePostReceiptRequestSerializer.php b/lib/Request/Receipts/CreatePostReceiptRequestSerializer.php
index 04c07a48..46f613df 100644
--- a/lib/Request/Receipts/CreatePostReceiptRequestSerializer.php
+++ b/lib/Request/Receipts/CreatePostReceiptRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -61,7 +61,7 @@ class CreatePostReceiptRequestSerializer
}
$customer = $request->getCustomer();
- if (!empty($customer)) {
+ if ($customer !== null) {
$result['customer'] = $customer->jsonSerialize();
}
diff --git a/lib/Request/Receipts/PaymentReceiptResponse.php b/lib/Request/Receipts/PaymentReceiptResponse.php
index 7f4a7bfc..5121b37e 100644
--- a/lib/Request/Receipts/PaymentReceiptResponse.php
+++ b/lib/Request/Receipts/PaymentReceiptResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -83,11 +83,13 @@ class PaymentReceiptResponse extends AbstractReceiptResponse
throw new InvalidPropertyValueTypeException('Invalid payment_id value type', 0, 'Receipt.paymentId');
} elseif (mb_strlen((string)$value) !== self::LENGTH_PAYMENT_ID) {
throw new InvalidPropertyValueException(
- 'Invalid payment_id value: "'.$value.'"', 0, 'Receipt.paymentId', $value
+ 'Invalid payment_id value: "' . $value . '"',
+ 0,
+ 'Receipt.paymentId',
+ $value
);
} else {
$this->_payment_id = (string)$value;
}
}
-
}
diff --git a/lib/Request/Receipts/ReceiptResponseFactory.php b/lib/Request/Receipts/ReceiptResponseFactory.php
index 58464dfb..a86b544d 100644
--- a/lib/Request/Receipts/ReceiptResponseFactory.php
+++ b/lib/Request/Receipts/ReceiptResponseFactory.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@
namespace YooKassa\Request\Receipts;
-
use YooKassa\Model\ReceiptType;
/**
diff --git a/lib/Request/Receipts/ReceiptResponseInterface.php b/lib/Request/Receipts/ReceiptResponseInterface.php
index 36e8f7bc..93b96dad 100644
--- a/lib/Request/Receipts/ReceiptResponseInterface.php
+++ b/lib/Request/Receipts/ReceiptResponseInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Receipts/ReceiptResponseItem.php b/lib/Request/Receipts/ReceiptResponseItem.php
index 327a1ebf..d154f05c 100644
--- a/lib/Request/Receipts/ReceiptResponseItem.php
+++ b/lib/Request/Receipts/ReceiptResponseItem.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -220,19 +220,26 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty description value in ReceiptItem', 0, 'ReceiptItem.description'
+ 'Empty description value in ReceiptItem',
+ 0,
+ 'ReceiptItem.description'
);
} elseif (TypeCast::canCastToString($value)) {
$castedValue = (string)$value;
if ($castedValue === '') {
throw new EmptyPropertyValueException(
- 'Empty description value in ReceiptItem', 0, 'ReceiptItem.description'
+ 'Empty description value in ReceiptItem',
+ 0,
+ 'ReceiptItem.description'
);
}
$this->_description = $castedValue;
} else {
throw new InvalidPropertyValueTypeException(
- 'Empty description value in ReceiptItem', 0, 'ReceiptItem.description', $value
+ 'Empty description value in ReceiptItem',
+ 0,
+ 'ReceiptItem.description',
+ $value
);
}
}
@@ -262,11 +269,17 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
throw new EmptyPropertyValueException('Empty quantity value in ReceiptItem', 0, 'ReceiptItem.quantity');
} elseif (!is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid quantity value type in ReceiptItem', 0, 'ReceiptItem.quantity', $value
+ 'Invalid quantity value type in ReceiptItem',
+ 0,
+ 'ReceiptItem.quantity',
+ $value
);
} elseif ($value <= 0.0) {
throw new InvalidPropertyValueException(
- 'Invalid quantity value in ReceiptItem', 0, 'ReceiptItem.quantity', $value
+ 'Invalid quantity value in ReceiptItem',
+ 0,
+ 'ReceiptItem.quantity',
+ $value
);
} else {
$this->_quantity = (float)$value;
@@ -325,11 +338,17 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
$this->_vatCode = null;
} elseif (!is_numeric($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid vatId value type in ReceiptItem', 0, 'ReceiptItem.vatId', $value
+ 'Invalid vatId value type in ReceiptItem',
+ 0,
+ 'ReceiptItem.vatId',
+ $value
);
} elseif ($value < 1 || $value > 6) {
throw new InvalidPropertyValueException(
- 'Invalid vatId value in ReceiptItem', 0, 'ReceiptItem.vatId', $value
+ 'Invalid vatId value in ReceiptItem',
+ 0,
+ 'ReceiptItem.vatId',
+ $value
);
} else {
$this->_vatCode = (int)$value;
@@ -385,7 +404,10 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
$this->_paymentMode = null;
} elseif (!TypeCast::canCastToString($value)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid paymentMode value type', 0, 'ReceiptItem.paymentMode', $value
+ 'Invalid paymentMode value type',
+ 0,
+ 'ReceiptItem.paymentMode',
+ $value
);
} else {
$this->_paymentMode = $value;
@@ -763,7 +785,9 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
{
if ($value === null || $value === '') {
throw new EmptyPropertyValueException(
- 'Empty supplier value in receipt', 0, 'Receipt.supplier'
+ 'Empty supplier value in receipt',
+ 0,
+ 'Receipt.supplier'
);
}
@@ -773,7 +797,10 @@ class ReceiptResponseItem extends AbstractObject implements ReceiptResponseItemI
if (!($value instanceof SupplierInterface)) {
throw new InvalidPropertyValueTypeException(
- 'Invalid supplier value type in receipt', 0, 'Receipt.supplier', $value
+ 'Invalid supplier value type in receipt',
+ 0,
+ 'Receipt.supplier',
+ $value
);
}
diff --git a/lib/Request/Receipts/ReceiptResponseItemInterface.php b/lib/Request/Receipts/ReceiptResponseItemInterface.php
index e0420843..dc8af777 100644
--- a/lib/Request/Receipts/ReceiptResponseItemInterface.php
+++ b/lib/Request/Receipts/ReceiptResponseItemInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -82,7 +82,7 @@ interface ReceiptResponseItemInterface
/**
* Возвращает общую стоимость покупаемого товара в копейках/центах
- * @return float Сумма стоимости покупаемого товара
+ * @return int Сумма стоимости покупаемого товара
*/
public function getAmount();
diff --git a/lib/Request/Receipts/ReceiptsRequest.php b/lib/Request/Receipts/ReceiptsRequest.php
index 19905674..3cc4928a 100644
--- a/lib/Request/Receipts/ReceiptsRequest.php
+++ b/lib/Request/Receipts/ReceiptsRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -128,13 +128,19 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$length = mb_strlen((string)$value, 'utf-8');
if ($length != 36) {
throw new InvalidPropertyValueException(
- 'Invalid payment id value in ReceiptsRequest', 0, 'ReceiptsRequest.refundId', $value
+ 'Invalid payment id value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.refundId',
+ $value
);
}
$this->_refundId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment id value type in ReceiptsRequest', 0, 'ReceiptsRequest.refundId', $value
+ 'Invalid payment id value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.refundId',
+ $value
);
}
}
@@ -172,13 +178,19 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$length = mb_strlen((string)$value, 'utf-8');
if ($length != 36) {
throw new InvalidPropertyValueException(
- 'Invalid payment id value in ReceiptsRequest', 0, 'ReceiptsRequest.paymentId', $value
+ 'Invalid payment id value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.paymentId',
+ $value
);
}
$this->_paymentId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment id value type in ReceiptsRequest', 0, 'ReceiptsRequest.paymentId', $value
+ 'Invalid payment id value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.paymentId',
+ $value
);
}
}
@@ -218,13 +230,17 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_gte value in ReceiptsRequest', 0, 'ReceiptsRequest.createdAtGte'
+ 'Invalid created_gte value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdAtGte'
);
}
$this->_createdAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_gte value type in ReceiptsRequest', 0, 'ReceiptsRequest.createdAtGte'
+ 'Invalid created_gte value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdAtGte'
);
}
}
@@ -264,13 +280,17 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_gt value in ReceiptsRequest', 0, 'ReceiptsRequest.createdAtGt'
+ 'Invalid created_gt value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdAtGt'
);
}
$this->_createdAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_gt value type in ReceiptsRequest', 0, 'ReceiptsRequest.createdAtGt'
+ 'Invalid created_gt value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdAtGt'
);
}
}
@@ -310,13 +330,17 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_lte value in ReceiptsRequest', 0, 'ReceiptsRequest.createdLte'
+ 'Invalid created_lte value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdLte'
);
}
$this->_createdAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_lte value type in ReceiptsRequest', 0, 'ReceiptsRequest.createdLte'
+ 'Invalid created_lte value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdLte'
);
}
}
@@ -356,13 +380,17 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_lt value in ReceiptsRequest', 0, 'ReceiptsRequest.createdLt'
+ 'Invalid created_lt value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdLt'
);
}
$this->_createdAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_lt value type in ReceiptsRequest', 0, 'ReceiptsRequest.createdLt'
+ 'Invalid created_lt value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.createdLt'
);
}
}
@@ -399,14 +427,20 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
} elseif (TypeCast::canCastToEnumString($value)) {
if (!RefundStatus::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid status value in ReceiptsRequest', 0, 'ReceiptsRequest.status', $value
+ 'Invalid status value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.status',
+ $value
);
} else {
$this->_status = (string)$value;
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in ReceiptsRequest', 0, 'ReceiptsRequest.status', $value
+ 'Invalid status value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.status',
+ $value
);
}
}
@@ -443,7 +477,10 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
$this->_cursor = (string) $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value type in ReceiptsRequest', 0, 'ReceiptsRequest.cursor', $value
+ 'Invalid status value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.cursor',
+ $value
);
}
}
@@ -479,13 +516,19 @@ class ReceiptsRequest extends AbstractRequest implements ReceiptsRequestInterfac
} elseif (is_int($value)) {
if ($value < 0 || $value > self::MAX_LIMIT_VALUE) {
throw new InvalidPropertyValueException(
- 'Invalid limit value in ReceiptsRequest', 0, 'ReceiptsRequest.limit', $value
+ 'Invalid limit value in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.limit',
+ $value
);
}
$this->_limit = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid limit value type in ReceiptsRequest', 0, 'ReceiptsRequest.limit', $value
+ 'Invalid limit value type in ReceiptsRequest',
+ 0,
+ 'ReceiptsRequest.limit',
+ $value
);
}
}
diff --git a/lib/Request/Receipts/ReceiptsRequestBuilder.php b/lib/Request/Receipts/ReceiptsRequestBuilder.php
index c239469e..2833cba6 100644
--- a/lib/Request/Receipts/ReceiptsRequestBuilder.php
+++ b/lib/Request/Receipts/ReceiptsRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Receipts/ReceiptsRequestInterface.php b/lib/Request/Receipts/ReceiptsRequestInterface.php
index 4ce23d6e..0313f6f3 100644
--- a/lib/Request/Receipts/ReceiptsRequestInterface.php
+++ b/lib/Request/Receipts/ReceiptsRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,107 +47,107 @@ interface ReceiptsRequestInterface
* Возвращает идентификатор возврата
* @return string Идентификатор возврата
*/
- function getRefundId();
+ public function getRefundId();
/**
* Проверяет, был ли установлен идентификатор возврата
* @return bool True если идентификатор возврата был установлен, false если не был
*/
- function hasRefundId();
+ public function hasRefundId();
/**
* Возвращает идентификатор платежа если он задан или null
* @return string|null Идентификатор платежа
*/
- function getPaymentId();
+ public function getPaymentId();
/**
* Проверяет, был ли задан идентификатор платежа
* @return bool True если идентификатор был задан, false если нет
*/
- function hasPaymentId();
+ public function hasPaymentId();
/**
* Возвращает дату создания от которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, от (включительно)
*/
- function getCreatedAtGte();
+ public function getCreatedAtGte();
/**
* Проверяет, была ли установлена дата создания от которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGte();
+ public function hasCreatedAtGte();
/**
* Возвращает дату создания от которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, от (не включая)
*/
- function getCreatedAtGt();
+ public function getCreatedAtGt();
/**
* Проверяет, была ли установлена дата создания от которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGt();
+ public function hasCreatedAtGt();
/**
* Возвращает дату создания до которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, до (включительно)
*/
- function getCreatedAtLte();
+ public function getCreatedAtLte();
/**
* Проверяет, была ли установлена дата создания до которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLte();
+ public function hasCreatedAtLte();
/**
* Возвращает дату создания до которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, до (не включая)
*/
- function getCreatedAtLt();
+ public function getCreatedAtLt();
/**
* Проверяет, была ли установлена дата создания до которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLt();
+ public function hasCreatedAtLt();
/**
* Возвращает статус выбираемых возвратов или null, если он до этого не был установлен
* @return string|null Статус выбираемых возвратов
*/
- function getStatus();
+ public function getStatus();
/**
* Проверяет, был ли установлен статус выбираемых возвратов
* @return bool True если статус был установлен, false если нет
*/
- function hasStatus();
+ public function hasStatus();
/**
* Возвращает токен для получения следующей страницы выборки
* @return string|null Токен для получения следующей страницы выборки
*/
- function getCursor();
+ public function getCursor();
/**
* Проверяет, был ли установлен токен следующей страницы
* @return bool True если токен был установлен, false если нет
*/
- function hasCursor();
+ public function hasCursor();
/**
* Возвращает ограничение количества объектов или null, если оно до этого не было установлено
* @return string|null Ограничение количества объектов
*/
- function getLimit();
+ public function getLimit();
/**
* Проверяет, было ли установлено ограничение количества объектов
* @return bool True если ограничение количества объектов было установлено, false если нет
*/
- function hasLimit();
+ public function hasLimit();
}
diff --git a/lib/Request/Receipts/ReceiptsRequestSerializer.php b/lib/Request/Receipts/ReceiptsRequestSerializer.php
index 4fe66e69..8b006ad6 100644
--- a/lib/Request/Receipts/ReceiptsRequestSerializer.php
+++ b/lib/Request/Receipts/ReceiptsRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Receipts/ReceiptsResponse.php b/lib/Request/Receipts/ReceiptsResponse.php
index 36be89f2..059ffb72 100644
--- a/lib/Request/Receipts/ReceiptsResponse.php
+++ b/lib/Request/Receipts/ReceiptsResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Receipts/RefundReceiptResponse.php b/lib/Request/Receipts/RefundReceiptResponse.php
index a1f10079..e8b86cd0 100644
--- a/lib/Request/Receipts/RefundReceiptResponse.php
+++ b/lib/Request/Receipts/RefundReceiptResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -83,11 +83,13 @@ class RefundReceiptResponse extends AbstractReceiptResponse
throw new InvalidPropertyValueTypeException('Invalid refund_id value type', 0, 'Receipt.refundId');
} elseif (mb_strlen((string)$value) !== self::LENGTH_REFUND_ID) {
throw new InvalidPropertyValueException(
- 'Invalid refund_id value: "'.$value.'"', 0, 'Receipt.refundId', $value
+ 'Invalid refund_id value: "' . $value . '"',
+ 0,
+ 'Receipt.refundId',
+ $value
);
} else {
$this->_refund_id = (string)$value;
}
}
-
}
diff --git a/lib/Request/Receipts/SimpleReceiptResponse.php b/lib/Request/Receipts/SimpleReceiptResponse.php
index 315f6dff..b85d9307 100644
--- a/lib/Request/Receipts/SimpleReceiptResponse.php
+++ b/lib/Request/Receipts/SimpleReceiptResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -41,5 +41,6 @@ class SimpleReceiptResponse extends AbstractReceiptResponse
* @return void
*/
public function setSpecificProperties($receiptData)
- {}
+ {
+ }
}
diff --git a/lib/Request/Refunds/AbstractRefundResponse.php b/lib/Request/Refunds/AbstractRefundResponse.php
index 85e6d37e..f11dce18 100644
--- a/lib/Request/Refunds/AbstractRefundResponse.php
+++ b/lib/Request/Refunds/AbstractRefundResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Refunds/CreateRefundRequest.php b/lib/Request/Refunds/CreateRefundRequest.php
index b47dd412..27d72dc7 100644
--- a/lib/Request/Refunds/CreateRefundRequest.php
+++ b/lib/Request/Refunds/CreateRefundRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -49,7 +49,6 @@ use YooKassa\Model\SourceInterface;
*/
class CreateRefundRequest extends AbstractRefundRequest implements CreateRefundRequestInterface
{
-
/**
* @var string Комментарий к операции возврата, основание для возврата средств покупателю.
*/
@@ -97,7 +96,10 @@ class CreateRefundRequest extends AbstractRefundRequest implements CreateRefundR
$this->_description = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid description value type in CreateRefundRequest', 0, 'CreateRefundRequest.description', $value
+ 'Invalid description value type in CreateRefundRequest',
+ 0,
+ 'CreateRefundRequest.description',
+ $value
);
}
}
@@ -198,7 +200,10 @@ class CreateRefundRequest extends AbstractRefundRequest implements CreateRefundR
$this->_deal = new RefundDealData($value);
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid deal value type in CreateRefundRequest', 0, 'CreateRefundRequest.deal', $value
+ 'Invalid deal value type in CreateRefundRequest',
+ 0,
+ 'CreateRefundRequest.deal',
+ $value
);
}
}
diff --git a/lib/Request/Refunds/CreateRefundRequestBuilder.php b/lib/Request/Refunds/CreateRefundRequestBuilder.php
index baa54c53..d99bd40f 100644
--- a/lib/Request/Refunds/CreateRefundRequestBuilder.php
+++ b/lib/Request/Refunds/CreateRefundRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@ use YooKassa\Model\SourceInterface;
*/
class CreateRefundRequestBuilder extends AbstractPaymentRequestBuilder
{
-
/**
* Собираемый объект запроса к API
* @var CreateRefundRequest
diff --git a/lib/Request/Refunds/CreateRefundRequestInterface.php b/lib/Request/Refunds/CreateRefundRequestInterface.php
index faefce84..de4fca81 100644
--- a/lib/Request/Refunds/CreateRefundRequestInterface.php
+++ b/lib/Request/Refunds/CreateRefundRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -47,89 +47,89 @@ interface CreateRefundRequestInterface
* Возвращает айди платежа для которого создаётся возврат средств
* @return string Айди платежа для которого создаётся возврат
*/
- function getPaymentId();
+ public function getPaymentId();
/**
* Возвращает сумму возвращаемых средств
* @return AmountInterface Сумма возврата
*/
- function getAmount();
+ public function getAmount();
/**
* Проверяет, был ли установлена идентификатор платежа
* @return bool True если идентификатор платежа был установлен, false если нет
*/
- function hasPaymentId();
+ public function hasPaymentId();
/**
* Устанавливает комментарий к возврату
* @param string $value Комментарий к операции возврата, основание для возврата средств покупателю
*/
- function setDescription($value);
+ public function setDescription($value);
/**
* Возвращает комментарий к возврату или null, если комментарий не задан
* @return string Комментарий к операции возврата, основание для возврата средств покупателю.
*/
- function getDescription();
+ public function getDescription();
/**
* Проверяет задан ли комментарий к создаваемому возврату
* @return bool True если комментарий установлен, false если нет
*/
- function hasDescription();
+ public function hasDescription();
/**
* Устанавливает чек
* @param ReceiptInterface|null $value Инстанс чека или null для удаления информации о чеке
*/
- function setReceipt($value);
+ public function setReceipt($value);
/**
* Возвращает инстанс чека или null, если чек не задан
* @return ReceiptInterface|null Инстанс чека или null
*/
- function getReceipt();
+ public function getReceipt();
/**
* Проверяет задан ли чек
* @return bool True если чек есть, false если нет
*/
- function hasReceipt();
+ public function hasReceipt();
/**
* Устанавливает информацию о распределении денег — сколько и в какой магазин нужно перевести
* @param SourceInterface[] $value Информация о распределении денег
*/
- function setSources($value);
+ public function setSources($value);
/**
* Возвращает информацию о распределении денег — сколько и в какой магазин нужно перевести
* @return SourceInterface[] Информация о распределении денег
*/
- function getSources();
+ public function getSources();
/**
* Проверяет наличие информации о распределении денег
* @return bool
*/
- function hasSources();
+ public function hasSources();
/**
* Устанавливает информацию о сделке
* @param RefundDealData $value Информация о сделке
*/
- function setDeal($value);
+ public function setDeal($value);
/**
* Возвращает информацию о сделке
* @return RefundDealData Информация о сделке
*/
- function getDeal();
+ public function getDeal();
/**
* Проверяет наличие информации о сделке
* @return bool
*/
- function hasDeal();
+ public function hasDeal();
}
diff --git a/lib/Request/Refunds/CreateRefundRequestSerializer.php b/lib/Request/Refunds/CreateRefundRequestSerializer.php
index ed2e6608..519fb24d 100644
--- a/lib/Request/Refunds/CreateRefundRequestSerializer.php
+++ b/lib/Request/Refunds/CreateRefundRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Refunds/CreateRefundResponse.php b/lib/Request/Refunds/CreateRefundResponse.php
index 90323964..1834c979 100644
--- a/lib/Request/Refunds/CreateRefundResponse.php
+++ b/lib/Request/Refunds/CreateRefundResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Refunds;
* @package YooKassa
*/
class CreateRefundResponse extends AbstractRefundResponse
-{}
+{
+}
diff --git a/lib/Request/Refunds/RefundResponse.php b/lib/Request/Refunds/RefundResponse.php
index 70b7494a..59862a5c 100644
--- a/lib/Request/Refunds/RefundResponse.php
+++ b/lib/Request/Refunds/RefundResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,4 +32,5 @@ namespace YooKassa\Request\Refunds;
* @package YooKassa
*/
class RefundResponse extends AbstractRefundResponse
-{}
+{
+}
diff --git a/lib/Request/Refunds/RefundsRequest.php b/lib/Request/Refunds/RefundsRequest.php
index 38d958aa..b336f2a2 100644
--- a/lib/Request/Refunds/RefundsRequest.php
+++ b/lib/Request/Refunds/RefundsRequest.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -125,13 +125,19 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$length = mb_strlen((string)$value, 'utf-8');
if ($length != 36) {
throw new InvalidPropertyValueException(
- 'Invalid payment id value in RefundsRequest', 0, 'RefundsRequest.paymentId', $value
+ 'Invalid payment id value in RefundsRequest',
+ 0,
+ 'RefundsRequest.paymentId',
+ $value
);
}
$this->_paymentId = (string)$value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid payment id value type in RefundsRequest', 0, 'RefundsRequest.paymentId', $value
+ 'Invalid payment id value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.paymentId',
+ $value
);
}
}
@@ -171,13 +177,17 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_gte value in RefundsRequest', 0, 'RefundsRequest.createdAtGte'
+ 'Invalid created_gte value in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdAtGte'
);
}
$this->_createdAtGte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_gte value type in RefundsRequest', 0, 'RefundsRequest.createdAtGte'
+ 'Invalid created_gte value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdAtGte'
);
}
}
@@ -217,13 +227,17 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_gt value in RefundsRequest', 0, 'RefundsRequest.createdAtGt'
+ 'Invalid created_gt value in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdAtGt'
);
}
$this->_createdAtGt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_gt value type in RefundsRequest', 0, 'RefundsRequest.createdAtGt'
+ 'Invalid created_gt value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdAtGt'
);
}
}
@@ -263,13 +277,17 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_lte value in RefundsRequest', 0, 'RefundsRequest.createdLte'
+ 'Invalid created_lte value in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdLte'
);
}
$this->_createdAtLte = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_lte value type in RefundsRequest', 0, 'RefundsRequest.createdLte'
+ 'Invalid created_lte value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdLte'
);
}
}
@@ -309,13 +327,17 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$dateTime = TypeCast::castToDateTime($value);
if ($dateTime === null) {
throw new InvalidPropertyValueException(
- 'Invalid created_lt value in RefundsRequest', 0, 'RefundsRequest.createdLt'
+ 'Invalid created_lt value in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdLt'
);
}
$this->_createdAtLt = $dateTime;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid created_lt value type in RefundsRequest', 0, 'RefundsRequest.createdLt'
+ 'Invalid created_lt value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.createdLt'
);
}
}
@@ -352,14 +374,20 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
} elseif (TypeCast::canCastToEnumString($value)) {
if (!RefundStatus::valueExists((string)$value)) {
throw new InvalidPropertyValueException(
- 'Invalid status value in RefundsRequest', 0, 'RefundsRequest.status', $value
+ 'Invalid status value in RefundsRequest',
+ 0,
+ 'RefundsRequest.status',
+ $value
);
} else {
$this->_status = (string)$value;
}
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value in RefundsRequest', 0, 'RefundsRequest.status', $value
+ 'Invalid status value in RefundsRequest',
+ 0,
+ 'RefundsRequest.status',
+ $value
);
}
}
@@ -396,7 +424,10 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
$this->_cursor = (string) $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid status value in RefundsRequest', 0, 'RefundsRequest.cursor', $value
+ 'Invalid status value in RefundsRequest',
+ 0,
+ 'RefundsRequest.cursor',
+ $value
);
}
}
@@ -432,13 +463,19 @@ class RefundsRequest extends AbstractRequest implements RefundsRequestInterface
} elseif (is_int($value)) {
if ($value < 0 || $value > self::MAX_LIMIT_VALUE) {
throw new InvalidPropertyValueException(
- 'Invalid limit value in RefundsRequest', 0, 'RefundsRequest.limit', $value
+ 'Invalid limit value in RefundsRequest',
+ 0,
+ 'RefundsRequest.limit',
+ $value
);
}
$this->_limit = $value;
} else {
throw new InvalidPropertyValueTypeException(
- 'Invalid limit value type in RefundsRequest', 0, 'RefundsRequest.limit', $value
+ 'Invalid limit value type in RefundsRequest',
+ 0,
+ 'RefundsRequest.limit',
+ $value
);
}
}
diff --git a/lib/Request/Refunds/RefundsRequestBuilder.php b/lib/Request/Refunds/RefundsRequestBuilder.php
index 6297456f..758235ab 100644
--- a/lib/Request/Refunds/RefundsRequestBuilder.php
+++ b/lib/Request/Refunds/RefundsRequestBuilder.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Refunds/RefundsRequestInterface.php b/lib/Request/Refunds/RefundsRequestInterface.php
index 00dbdcaf..8ee8fd2b 100644
--- a/lib/Request/Refunds/RefundsRequestInterface.php
+++ b/lib/Request/Refunds/RefundsRequestInterface.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -46,83 +46,83 @@ interface RefundsRequestInterface
* Возвращает идентификатор платежа если он задан или null
* @return string|null Идентификатор платежа
*/
- function getPaymentId();
+ public function getPaymentId();
/**
* Проверяет, был ли задан идентификатор платежа
* @return bool True если идентификатор был задан, false если нет
*/
- function hasPaymentId();
+ public function hasPaymentId();
/**
* Возвращает дату создания от которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, от (включительно)
*/
- function getCreatedAtGte();
+ public function getCreatedAtGte();
/**
* Проверяет, была ли установлена дата создания от которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGte();
+ public function hasCreatedAtGte();
/**
* Возвращает дату создания от которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, от (не включая)
*/
- function getCreatedAtGt();
+ public function getCreatedAtGt();
/**
* Проверяет, была ли установлена дата создания от которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtGt();
+ public function hasCreatedAtGt();
/**
* Возвращает дату создания до которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, до (включительно)
*/
- function getCreatedAtLte();
+ public function getCreatedAtLte();
/**
* Проверяет, была ли установлена дата создания до которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLte();
+ public function hasCreatedAtLte();
/**
* Возвращает дату создания до которой будут возвращены возвраты или null, если дата не была установлена
* @return \DateTime|null Время создания, до (не включая)
*/
- function getCreatedAtLt();
+ public function getCreatedAtLt();
/**
* Проверяет, была ли установлена дата создания до которой выбираются возвраты
* @return bool True если дата была установлена, false если нет
*/
- function hasCreatedAtLt();
+ public function hasCreatedAtLt();
/**
* Возвращает статус выбираемых возвратов или null, если он до этого не был установлен
* @return string|null Статус выбираемых возвратов
*/
- function getStatus();
+ public function getStatus();
/**
* Проверяет, был ли установлен статус выбираемых возвратов
* @return bool True если статус был установлен, false если нет
*/
- function hasStatus();
+ public function hasStatus();
/**
* Возвращает токен для получения следующей страницы выборки
* @return string|null Токен для получения следующей страницы выборки
*/
- function getCursor();
+ public function getCursor();
/**
* Проверяет, был ли установлен токен следующей страницы
* @return bool True если токен был установлен, false если нет
*/
- function hasCursor();
+ public function hasCursor();
}
diff --git a/lib/Request/Refunds/RefundsRequestSerializer.php b/lib/Request/Refunds/RefundsRequestSerializer.php
index 972a77b1..d5c61524 100644
--- a/lib/Request/Refunds/RefundsRequestSerializer.php
+++ b/lib/Request/Refunds/RefundsRequestSerializer.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/Request/Refunds/RefundsResponse.php b/lib/Request/Refunds/RefundsResponse.php
index 63bc95f3..be7e257d 100644
--- a/lib/Request/Refunds/RefundsResponse.php
+++ b/lib/Request/Refunds/RefundsResponse.php
@@ -3,7 +3,7 @@
/**
* The MIT License
*
- * Copyright (c) 2022 "YooMoney", NBСO LLC
+ * Copyright (c) 2023 "YooMoney", NBСO LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -88,5 +88,4 @@ class RefundsResponse
{
return $this->nextCursor !== null;
}
-
}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequest.php b/lib/Request/SelfEmployed/SelfEmployedRequest.php
new file mode 100644
index 00000000..59a5b191
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequest.php
@@ -0,0 +1,209 @@
+_itn;
+ }
+
+ /**
+ * Устанавливает ИНН самозанятого
+ *
+ * @param string|null $itn ИНН самозанятого
+ *
+ * @return $this
+ */
+ public function setItn($itn = null)
+ {
+ if ($itn === null || $itn === '') {
+ $this->_itn = null;
+ } elseif (!TypeCast::canCastToString($itn)) {
+ throw new InvalidPropertyValueTypeException('Invalid itn value type', 0, 'SelfEmployed.itn');
+ } else {
+ $this->_itn = (string)preg_replace('/\D/', '', $itn);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие ИНН самозанятого в запросе
+ * @return bool True если ИНН самозанятого задан, false если нет
+ */
+ public function hasItn()
+ {
+ return !empty($this->_itn);
+ }
+
+ /**
+ * Возвращает телефон самозанятого.
+ *
+ * @return string|null Телефон самозанятого
+ */
+ public function getPhone()
+ {
+ return $this->_phone;
+ }
+
+ /**
+ * Устанавливает телефон самозанятого.
+ *
+ * @param string|null $phone Телефон самозанятого
+ *
+ * @return $this
+ */
+ public function setPhone($phone = null)
+ {
+ if ($phone === null || $phone === '') {
+ $this->_phone = null;
+ } elseif (!TypeCast::canCastToString($phone)) {
+ throw new InvalidPropertyValueTypeException('Invalid phone value type', 0, 'SelfEmployedRequest.phone');
+ } else {
+ $this->_phone = (string)preg_replace('/\D/', '', $phone);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие телефона самозанятого в запросе
+ * @return bool True если телефон самозанятого задан, false если нет
+ */
+ public function hasPhone()
+ {
+ return !empty($this->_phone);
+ }
+
+ /**
+ * Возвращает сценарий подтверждения.
+ *
+ * @return SelfEmployedRequestConfirmation|null Сценарий подтверждения
+ */
+ public function getConfirmation()
+ {
+ return $this->_confirmation;
+ }
+
+ /**
+ * Устанавливает сценарий подтверждения.
+ *
+ * @param SelfEmployedConfirmation|array|null $confirmation Сценарий подтверждения
+ *
+ * @return $this
+ */
+ public function setConfirmation($confirmation = null)
+ {
+ if ($confirmation === null || $confirmation === '') {
+ $this->_confirmation = null;
+ } elseif (is_array($confirmation)) {
+ $factory = new SelfEmployedRequestConfirmationFactory();
+ $this->_confirmation = $factory->factoryFromArray($confirmation);
+ } elseif ($confirmation instanceof SelfEmployedRequestConfirmation) {
+ $this->_confirmation = $confirmation;
+ } else {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "confirmation" parameter in SelfEmployedRequest',
+ 0,
+ 'SelfEmployedRequest.confirmation',
+ $confirmation
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Проверяет наличие сценария подтверждения самозанятого в запросе
+ * @return bool True если сценарий подтверждения самозанятого задан, false если нет
+ */
+ public function hasConfirmation()
+ {
+ return !empty($this->_confirmation);
+ }
+
+ /**
+ * Проверяет на валидность текущий объект
+ * @return bool True если объект запроса валиден, false если нет
+ */
+ public function validate()
+ {
+ if (!$this->hasPhone() && !$this->hasItn()) {
+ $this->setValidationError('Both itn and phone values are empty in SelfEmployedRequest');
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Возвращает билдер объектов запросов создания платежа
+ * @return SelfEmployedRequestBuilder Инстанс билдера объектов запросов
+ */
+ public static function builder()
+ {
+ return new SelfEmployedRequestBuilder();
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequestBuilder.php b/lib/Request/SelfEmployed/SelfEmployedRequestBuilder.php
new file mode 100644
index 00000000..2c5cef8a
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequestBuilder.php
@@ -0,0 +1,111 @@
+currentObject->setItn($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает телефон самозанятого.
+ *
+ * @param string|null $value Телефон самозанятого.
+ *
+ * @return self Инстанс билдера запросов
+ */
+ public function setPhone($value)
+ {
+ $this->currentObject->setPhone($value);
+
+ return $this;
+ }
+
+ /**
+ * Устанавливает сценарий подтверждения.
+ *
+ * @param SelfEmployedConfirmation|array|null $value Сценарий подтверждения.
+ *
+ * @return self Инстанс билдера запросов
+ */
+ public function setConfirmation($value)
+ {
+ $this->currentObject->setConfirmation($value);
+
+ return $this;
+ }
+
+ /**
+ * Строит и возвращает объект запроса для отправки в API ЮKassa
+ * @param array|null $options Массив параметров для установки в объект запроса
+ * @return SelfEmployedRequest|AbstractRequest Инстанс объекта запроса
+ *
+ * @throws InvalidRequestException Выбрасывается если собрать объект запроса не удалось
+ */
+ public function build(array $options = null)
+ {
+ return parent::build($options);
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequestConfirmation.php b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmation.php
new file mode 100644
index 00000000..7c25d397
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmation.php
@@ -0,0 +1,90 @@
+_type;
+ }
+
+ /**
+ * Устанавливает тип сценария подтверждения
+ * @param string $value
+ */
+ protected function setType($value)
+ {
+ if ($value === null || $value === '') {
+ throw new EmptyPropertyValueException(
+ 'Empty value for "type" parameter in SelfEmployedRequestConfirmation',
+ 0,
+ 'confirmation.type'
+ );
+ }
+ if (!TypeCast::canCastToEnumString($value)) {
+ throw new InvalidPropertyValueTypeException(
+ 'Invalid value type for "type" parameter in SelfEmployedRequestConfirmation',
+ 0,
+ 'confirmation.type',
+ $value
+ );
+ }
+ if (!SelfEmployedConfirmationType::valueExists($value)) {
+ throw new InvalidPropertyValueException(
+ 'Invalid value for "type" parameter in SelfEmployedRequestConfirmation',
+ 0,
+ 'confirmation.type',
+ $value
+ );
+ }
+ $this->_type = (string)$value;
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationFactory.php b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationFactory.php
new file mode 100644
index 00000000..acb6c0da
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationFactory.php
@@ -0,0 +1,91 @@
+ 'SelfEmployedRequestConfirmationRedirect',
+ );
+
+ /**
+ * Возвращает объект, соответствующий типу подтверждения платежа
+ *
+ * @param string $type Тип подтверждения платежа
+ *
+ * @return SelfEmployedRequestConfirmation
+ */
+ public function factory($type)
+ {
+ if (!is_string($type)) {
+ throw new \InvalidArgumentException('Invalid confirmation value in confirmation factory');
+ }
+ if (!array_key_exists($type, $this->typeClassMap)) {
+ throw new \InvalidArgumentException('Invalid confirmation value type "' . $type . '"');
+ }
+ $className = __NAMESPACE__ . '\\' . $this->typeClassMap[$type];
+
+ return new $className();
+ }
+
+ /**
+ * Возвращает объект, соответствующий типу подтверждения платежа, из массива данных
+ *
+ * @param array $data Массив данных подтверждения платежа
+ * @param string|null $type Тип подтверждения платежа
+ *
+ * @return SelfEmployedRequestConfirmation
+ */
+ public function factoryFromArray(array $data, $type = null)
+ {
+ if ($type === null) {
+ if (array_key_exists('type', $data)) {
+ $type = $data['type'];
+ unset($data['type']);
+ } else {
+ throw new \InvalidArgumentException(
+ 'Parameter type not specified in SelfEmployedRequestConfirmation.factoryFromArray()'
+ );
+ }
+ }
+ $confirmation = $this->factory($type);
+ foreach ($data as $key => $value) {
+ if ($confirmation->offsetExists($key)) {
+ $confirmation->offsetSet($key, $value);
+ }
+ }
+
+ return $confirmation;
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationRedirect.php b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationRedirect.php
new file mode 100644
index 00000000..c093b64c
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequestConfirmationRedirect.php
@@ -0,0 +1,45 @@
+setType(SelfEmployedConfirmationType::REDIRECT);
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedRequestSerializer.php b/lib/Request/SelfEmployed/SelfEmployedRequestSerializer.php
new file mode 100644
index 00000000..e6d66132
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedRequestSerializer.php
@@ -0,0 +1,58 @@
+hasItn()) {
+ $result['itn'] = $request->getItn();
+ }
+ if ($request->hasPhone()) {
+ $result['phone'] = $request->getPhone();
+ }
+ if ($request->hasConfirmation()) {
+ $result['confirmation'] = $request->getConfirmation()->toArray();
+ }
+
+ return $result;
+ }
+}
diff --git a/lib/Request/SelfEmployed/SelfEmployedResponse.php b/lib/Request/SelfEmployed/SelfEmployedResponse.php
new file mode 100644
index 00000000..5162cb2c
--- /dev/null
+++ b/lib/Request/SelfEmployed/SelfEmployedResponse.php
@@ -0,0 +1,42 @@
+
+
+ The coding standard for YooKassa SDK.
+
+ lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phpdoc.xml b/phpdoc.xml
index 0bed2116..122b839e 100644
--- a/phpdoc.xml
+++ b/phpdoc.xml
@@ -9,7 +9,7 @@
-
+ latest
@@ -34,9 +34,12 @@
extendsimplements
+
+ examples
+ YooKassatrue
-
+
diff --git a/phpmd.xml b/phpmd.xml
new file mode 100644
index 00000000..b046ed2e
--- /dev/null
+++ b/phpmd.xml
@@ -0,0 +1,35 @@
+
+
+
+ Ruleset for PHPMD analysis of Drupal projects. Excludes coding issues
+ handled better by PHPCS and rules which have too many false positives
+ in a typical YooKassa codebase.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
diff --git a/tests/AutoloadTest.php b/tests/AutoloadTest.php
index 5c87ad51..11a2c4f3 100644
--- a/tests/AutoloadTest.php
+++ b/tests/AutoloadTest.php
@@ -1,4 +1,5 @@
setApiClient($curlClientStub)->setAuth('shopId', 'shopPassword');
try {
- $apiClient->createPayment($payment,123);
+ $apiClient->createPayment($payment, 123);
} catch (ApiException $e) {
self::assertInstanceOf($requiredException, $e);
return;
@@ -1004,7 +1009,6 @@ class ClientTest extends TestCase
->setApiClient($curlClientStub)
->setAuth('shopId', 'shopPassword')
->getPaymentInfo(Random::str(36));
-
}
public function testConfig()
@@ -1026,11 +1030,11 @@ class ClientTest extends TestCase
$apiClient->setLogger($logger);
$clientMock = $this->getMockBuilder('YooKassa\Client\ApiClientInterface')
- ->setMethods(array('setLogger', 'setConfig', 'call', 'setShopId', 'getUserAgent', 'setBearerToken', 'setShopPassword'))
+ ->setMethods(array('setLogger', 'setConfig', 'call', 'setShopId', 'getUserAgent', 'setBearerToken', 'setShopPassword', 'setAdvancedCurlOptions'))
->disableOriginalConstructor()
->getMock();
$expectedLoggers = array();
- $clientMock->expects(self::exactly(3))->method('setLogger')->willReturnCallback(function ($logger) use(&$expectedLoggers) {
+ $clientMock->expects(self::exactly(3))->method('setLogger')->willReturnCallback(function ($logger) use (&$expectedLoggers) {
$expectedLoggers[] = $logger;
});
$clientMock->expects(self::once())->method('setConfig')->willReturn($clientMock);
@@ -1096,8 +1100,10 @@ class ClientTest extends TestCase
self::fail('Exception not thrown');
} catch (JsonException $e) {
self::assertEquals(JSON_ERROR_UTF8, $e->getCode());
- self::assertEquals('Failed serialize json. Malformed UTF-8 characters, possibly incorrectly encoded',
- $e->getMessage());
+ self::assertEquals(
+ 'Failed serialize json. Malformed UTF-8 characters, possibly incorrectly encoded',
+ $e->getMessage()
+ );
}
} else {
$value = array('test' => iconv('utf-8', 'windows-1251', 'абвгдеёжз'));
@@ -1106,7 +1112,8 @@ class ClientTest extends TestCase
}
}
- public function testCreatePaymentErrors() {
+ public function testCreatePaymentErrors()
+ {
$payment = CreatePaymentRequest::builder()
->setAmount(123)
->setPaymentToken(Random::str(36))
@@ -1726,6 +1733,501 @@ class ClientTest extends TestCase
);
}
+ public function testCreatePersonalData()
+ {
+ $personalData = CreatePersonalDataRequest::builder()
+ ->setType(PersonalDataType::SBP_PAYOUT_RECIPIENT)
+ ->setLastName('Иванов')
+ ->setFirstName('Иван')
+ ->setMiddleName('Иванович')
+ ->setMetadata(array('recipient_id' => '37'))
+ ->build();
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createPersonalDataFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData($personalData);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof PersonalDataResponse);
+
+ $personalData = CreatePersonalDataRequest::builder()
+ ->setType(PersonalDataType::SBP_PAYOUT_RECIPIENT)
+ ->setLastName('Иванов')
+ ->setFirstName('Иван')
+ ->setMiddleName('Иванович')
+ ->setMetadata(array('recipient_id' => '37'))
+ ->build();
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createPersonalDataFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData($personalData);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof PersonalDataResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createPersonalDataFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData(array(
+ 'type' => 'sbp_payout_recipient',
+ 'last_name' => 'Иванов',
+ 'first_name' => 'Иван',
+ 'middle_name' => 'Иванович',
+ 'metadata' => array('recipient_id' => '37'),
+ ), 123);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof PersonalDataResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted","retry_after":1800}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData($personalData, 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ApiException $e) {
+ self::assertInstanceOf('YooKassa\Common\Exceptions\ResponseProcessingException', $e);
+ return;
+ }
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted"}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData($personalData, 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted"}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createPersonalData(array(
+ 'type' => 'sbp_payout_recipient',
+ 'last_name' => 'Иванов',
+ 'first_name' => 'Иван',
+ 'middle_name' => 'Иванович',
+ 'metadata' => array('recipient_id' => '37'),
+ ), 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+ }
+
+ /**
+ * @dataProvider personalDataInfoDataProvider
+ * @param mixed $personalDataId
+ * @param string $exceptionClassName
+ * @throws ApiException
+ * @throws ResponseProcessingException
+ * @throws BadApiRequestException
+ * @throws ForbiddenException
+ * @throws InternalServerError
+ * @throws NotFoundException
+ * @throws TooManyRequestsException
+ * @throws UnauthorizedException
+ * @throws ExtensionNotFoundException
+ */
+ public function testGetPersonalDataInfo($personalDataId, $exceptionClassName = null)
+ {
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($exceptionClassName !== null ? self::never() : self::once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('personalDataInfoFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+
+ if ($exceptionClassName !== null) {
+ $this->setExpectedException($exceptionClassName);
+ }
+
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->getPersonalDataInfo($personalDataId);
+
+ self::assertTrue($response instanceof PersonalDataResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted","retry_after":1800}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->getPersonalDataInfo($personalDataId);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+ }
+
+ public function personalDataInfoDataProvider()
+ {
+ return array(
+ array(null, '\InvalidArgumentException'),
+ array(Random::str(36)),
+ array(new StringObject(Random::str(36))),
+ array(true, '\InvalidArgumentException'),
+ array(false, '\InvalidArgumentException'),
+ array(0, '\InvalidArgumentException'),
+ array(1, '\InvalidArgumentException'),
+ array(0.1, '\InvalidArgumentException'),
+ array(Random::str(35), '\InvalidArgumentException'),
+ array(Random::str(51), '\InvalidArgumentException'),
+ array(new DateTime(), '\InvalidArgumentException'),
+ array(array(), '\InvalidArgumentException'),
+ );
+ }
+
+ /**
+ * @dataProvider paymentsListDataProvider
+ *
+ * @throws ApiException
+ * @throws ResponseProcessingException
+ * @throws BadApiRequestException
+ * @throws ForbiddenException
+ * @throws InternalServerError
+ * @throws NotFoundException
+ * @throws TooManyRequestsException
+ * @throws UnauthorizedException
+ * @throws ExtensionNotFoundException
+ */
+ public function testSbpBanksList()
+ {
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('getSbpBanksFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->getSbpBanks();
+
+ $this->assertTrue($response instanceof SbpBanksResponse);
+ }
+
+
+ public function testCreateSelfEmployed()
+ {
+ $selfEmployed = SelfEmployedRequest::builder()
+ ->setItn('123456789012')
+ ->setPhone('79001002030')
+ ->setConfirmation(array('type' => 'redirect'))
+ ->build();
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createSelfEmployedFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed($selfEmployed);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof SelfEmployedResponse);
+
+ $selfEmployed = SelfEmployedRequest::builder()
+ ->setItn('123456789012')
+ ->setPhone('79001002030')
+ ->setConfirmation(array('type' => 'redirect'))
+ ->build();
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createSelfEmployedFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed($selfEmployed);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof SelfEmployedResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('createSelfEmployedFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed(array(
+ 'itn' => '123456789012',
+ 'phone' => '79001002030',
+ 'confirmation' => array('type' => 'redirect'),
+ ), 123);
+
+ self::assertSame($curlClientStub, $apiClient->getApiClient());
+ self::assertTrue($response instanceof SelfEmployedResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted","retry_after":1800}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed($selfEmployed, 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ApiException $e) {
+ self::assertInstanceOf('YooKassa\Common\Exceptions\ResponseProcessingException', $e);
+ return;
+ }
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted"}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed($selfEmployed, 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted"}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->createSelfEmployed(array(
+ 'itn' => '123456789012',
+ 'phone' => '79001002030',
+ 'confirmation' => array('type' => 'redirect'),
+ ), 123);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+ }
+
+ /**
+ * @dataProvider selfEmployedInfoDataProvider
+ *
+ * @param mixed $selfEmployedId
+ * @param string $exceptionClassName
+ *
+ * @throws ApiException
+ * @throws ResponseProcessingException
+ * @throws BadApiRequestException
+ * @throws ForbiddenException
+ * @throws InternalServerError
+ * @throws NotFoundException
+ * @throws TooManyRequestsException
+ * @throws UnauthorizedException
+ * @throws ExtensionNotFoundException
+ */
+ public function testGetSelfEmployedInfo($selfEmployedId, $exceptionClassName = null)
+ {
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($exceptionClassName !== null ? self::never() : self::once())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ $this->getFixtures('selfEmployedInfoFixtures.json'),
+ array('http_code' => 200)
+ ));
+
+ $apiClient = new Client();
+
+ if ($exceptionClassName !== null) {
+ $this->setExpectedException($exceptionClassName);
+ }
+
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->getSelfEmployedInfo($selfEmployedId);
+
+ self::assertTrue($response instanceof SelfEmployedResponse);
+
+ $curlClientStub = $this->getCurlClientStub();
+ $curlClientStub
+ ->expects($this->any())
+ ->method('sendRequest')
+ ->willReturn(array(
+ array('Header-Name' => 'HeaderValue'),
+ '{"type":"error","code":"request_accepted","retry_after":1800}',
+ array('http_code' => 202)
+ ));
+
+ try {
+ $apiClient->setRetryTimeout(0);
+ $response = $apiClient
+ ->setApiClient($curlClientStub)
+ ->setAuth('shopId', 'shopPassword')
+ ->getSelfEmployedInfo($selfEmployedId);
+ self::fail('Исключение не было выброшено');
+ } catch (ResponseProcessingException $e) {
+ self::assertEquals(Client::DEFAULT_DELAY, $e->retryAfter);
+ return;
+ }
+ }
+
+ public function selfEmployedInfoDataProvider()
+ {
+ return array(
+ array(null, '\InvalidArgumentException'),
+ array(Random::str(36)),
+ array(new StringObject(Random::str(36))),
+ array(true, '\InvalidArgumentException'),
+ array(false, '\InvalidArgumentException'),
+ array(0, '\InvalidArgumentException'),
+ array(1, '\InvalidArgumentException'),
+ array(0.1, '\InvalidArgumentException'),
+ array(Random::str(35), '\InvalidArgumentException'),
+ array(Random::str(51), '\InvalidArgumentException'),
+ array(new DateTime(), '\InvalidArgumentException'),
+ array(array(), '\InvalidArgumentException'),
+ );
+ }
+
/**
* @return PHPUnit_Framework_MockObject_MockObject
*/
diff --git a/tests/Client/CurlClientTest.php b/tests/Client/CurlClientTest.php
index 82675858..c27c29cc 100644
--- a/tests/Client/CurlClientTest.php
+++ b/tests/Client/CurlClientTest.php
@@ -68,16 +68,26 @@ class CurlClientTest extends TestCase
array('http_code' => 200),
));
$curlClientMock->expects($this->once())->method('closeCurlConnection');
- $curlClientMock->call('', HttpVerb::HEAD, array('queryParam' => 'value'), 'testBodyValue',
- array('testHeader' => 'testValue'));
+ $curlClientMock->call(
+ '',
+ HttpVerb::HEAD,
+ array('queryParam' => 'value'),
+ 'testBodyValue',
+ array('testHeader' => 'testValue')
+ );
}
public function testAuthorizeException()
{
$this->setExpectedException('YooKassa\Common\Exceptions\AuthorizeException');
$client = new CurlClient();
- $client->call('', HttpVerb::HEAD, array('queryParam' => 'value'), array('httpBody' => 'testValue'),
- array('testHeader' => 'testValue'));
+ $client->call(
+ '',
+ HttpVerb::HEAD,
+ array('queryParam' => 'value'),
+ array('httpBody' => 'testValue'),
+ array('testHeader' => 'testValue')
+ );
}
public function curlErrorCodeProvider()
diff --git a/tests/Client/UserAgentTest.php b/tests/Client/UserAgentTest.php
index b7532ec2..3c29113f 100644
--- a/tests/Client/UserAgentTest.php
+++ b/tests/Client/UserAgentTest.php
@@ -7,7 +7,6 @@ use ReflectionClass;
use ReflectionException;
use YooKassa\Client\UserAgent;
-
class UserAgentTest extends TestCase
{
/**
@@ -26,8 +25,8 @@ class UserAgentTest extends TestCase
$method = $reflector->getMethod('setSdk');
$method->setAccessible(true);
$method->invokeArgs($agent, array('name' => 'YooKassa.PHP', 'version' => '1.4.1'));
- $agent->setCms('Wordpress','2.0.4');
- $agent->setModule('Woocommerce','1.2.3');
+ $agent->setCms('Wordpress', '2.0.4');
+ $agent->setModule('Woocommerce', '1.2.3');
$this->assertEquals('CentOS/6.7 PHP/5.4.45 Wordpress/2.0.4 Woocommerce/1.2.3 YooKassa.PHP/1.4.1', $agent->getHeaderString());
}
diff --git a/tests/Client/fixtures/createPersonalDataFixtures.json b/tests/Client/fixtures/createPersonalDataFixtures.json
new file mode 100644
index 00000000..2ef4a769
--- /dev/null
+++ b/tests/Client/fixtures/createPersonalDataFixtures.json
@@ -0,0 +1,9 @@
+{
+ "type": "sbp_payout_recipient",
+ "last_name": "Иванов",
+ "first_name": "Иван",
+ "middle_name": "Иванович",
+ "metadata": {
+ "recipient_id": "37"
+ }
+}
diff --git a/tests/Client/fixtures/createSelfEmployedFixtures.json b/tests/Client/fixtures/createSelfEmployedFixtures.json
new file mode 100644
index 00000000..3ad65dd5
--- /dev/null
+++ b/tests/Client/fixtures/createSelfEmployedFixtures.json
@@ -0,0 +1,7 @@
+{
+ "itn": "123456789012",
+ "phone": "79001002030",
+ "confirmation": {
+ "type": "redirect"
+ }
+}
diff --git a/tests/Client/fixtures/getSbpBanksFixtures.json b/tests/Client/fixtures/getSbpBanksFixtures.json
new file mode 100644
index 00000000..7ab2bed0
--- /dev/null
+++ b/tests/Client/fixtures/getSbpBanksFixtures.json
@@ -0,0 +1,10 @@
+{
+ "type": "list",
+ "items": [
+ {
+ "bank_id": "100000000111",
+ "name": "Сбербанк",
+ "bic": "044525225"
+ }
+ ]
+}
diff --git a/tests/Client/fixtures/personalDataInfoFixtures.json b/tests/Client/fixtures/personalDataInfoFixtures.json
new file mode 100644
index 00000000..f7da89f4
--- /dev/null
+++ b/tests/Client/fixtures/personalDataInfoFixtures.json
@@ -0,0 +1,13 @@
+{
+ "id": "pd-285c0ab7-0003-5000-9000-0e1166498fda",
+ "type": "sbp_payout_recipient",
+ "status": "waiting_for_operation",
+ "created_at": "2021-06-16T13:04:55.633Z",
+ "metadata": {
+ "order_id": 37
+ },
+ "cancellation_details": {
+ "party": "yoo_money",
+ "reason": "general_decline"
+ }
+}
diff --git a/tests/Client/fixtures/selfEmployedInfoFixtures.json b/tests/Client/fixtures/selfEmployedInfoFixtures.json
new file mode 100644
index 00000000..5bc76b20
--- /dev/null
+++ b/tests/Client/fixtures/selfEmployedInfoFixtures.json
@@ -0,0 +1,12 @@
+{
+ "id": "se-d6b9b3fa-0cb8-4aa8-b3c0-254bf0358d4c",
+ "status": "pending",
+ "created_at": "2019-03-12T11:10:41.802Z",
+ "itn": "123456789012",
+ "phone": "79297771234",
+ "confirmation": {
+ "type": "redirect",
+ "confirmation_url": "https://himself-ktr.nalog.ru/settings/partners"
+ },
+ "test": false
+}
diff --git a/tests/Common/AbstractEnumTest.php b/tests/Common/AbstractEnumTest.php
index 90ff1aab..495c08be 100644
--- a/tests/Common/AbstractEnumTest.php
+++ b/tests/Common/AbstractEnumTest.php
@@ -64,4 +64,4 @@ class TestAbstractEnum extends AbstractEnum
self::ENUM_DISABLED_VALUE_1 => false,
self::ENUM_DISABLED_VALUE_2 => false,
);
-}
\ No newline at end of file
+}
diff --git a/tests/Common/AbstractObjectTest.php b/tests/Common/AbstractObjectTest.php
index b16a737d..5a9bbe1d 100644
--- a/tests/Common/AbstractObjectTest.php
+++ b/tests/Common/AbstractObjectTest.php
@@ -233,4 +233,4 @@ class TestAbstractObject extends AbstractObject
{
$this->_anotherProperty = $value;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Common/AbstractRequestBuilderTest.php b/tests/Common/AbstractRequestBuilderTest.php
index e5aadc34..4d78c5ae 100644
--- a/tests/Common/AbstractRequestBuilderTest.php
+++ b/tests/Common/AbstractRequestBuilderTest.php
@@ -136,4 +136,4 @@ class TestAbstractRequestClass extends AbstractRequest
}
return $this->valid;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Common/Exceptions/ExtensionNotFoundExceptionTest.php b/tests/Common/Exceptions/ExtensionNotFoundExceptionTest.php
index 62b4ae4a..5d300adf 100644
--- a/tests/Common/Exceptions/ExtensionNotFoundExceptionTest.php
+++ b/tests/Common/Exceptions/ExtensionNotFoundExceptionTest.php
@@ -1,6 +1,5 @@
getMessage());
} else {
- self::assertEquals($tmp['description'].'.', $instance->getMessage());
+ self::assertEquals($tmp['description'] . '.', $instance->getMessage());
}
}
@@ -99,7 +99,7 @@ class ResponseProcessingExceptionTest extends ApiExceptionTest
$tmp = json_decode($body, true);
$message = '';
if (!empty($tmp['description'])) {
- $message = $tmp['description'].'.';
+ $message = $tmp['description'] . '.';
}
self::assertEquals($message, $instance->getMessage());
diff --git a/tests/Common/LegacyJsonInterfaceTest.php b/tests/Common/LegacyJsonInterfaceTest.php
index 5448bae9..0337dc5d 100644
--- a/tests/Common/LegacyJsonInterfaceTest.php
+++ b/tests/Common/LegacyJsonInterfaceTest.php
@@ -18,4 +18,4 @@ class LegacyJsonSerializableInterfaceTest extends TestCase
self::assertTrue($reflection->isUserDefined());
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Common/LoggerWrapperTest.php b/tests/Common/LoggerWrapperTest.php
index 1aead0c7..68b50859 100644
--- a/tests/Common/LoggerWrapperTest.php
+++ b/tests/Common/LoggerWrapperTest.php
@@ -13,7 +13,8 @@ class LoggerWrapperTest extends TestCase
{
$logger = new LoggerWrapper(new ArrayLogger());
self::assertNotNull($logger);
- $logger = new LoggerWrapper(function ($level, $message, $context) {});
+ $logger = new LoggerWrapper(function ($level, $message, $context) {
+ });
self::assertNotNull($logger);
}
@@ -58,7 +59,7 @@ class LoggerWrapperTest extends TestCase
self::assertEquals($expected, $wrapped->getLastLog());
$wrapped = new ArrayLogger();
- $instance = new LoggerWrapper(function ($level, $message, $context) use($wrapped) {
+ $instance = new LoggerWrapper(function ($level, $message, $context) use ($wrapped) {
$wrapped->log($level, $message, $context);
});
$instance->log($level, $message, $context);
@@ -88,7 +89,7 @@ class LoggerWrapperTest extends TestCase
$wrapped = new ArrayLogger();
$instance = new LoggerWrapper($wrapped);
foreach ($methodsMap as $level => $method) {
- $instance->{$method} ($message, $context);
+ $instance->{$method}($message, $context);
$expected = array($level, $message, $context);
self::assertEquals($expected, $wrapped->getLastLog());
}
@@ -122,4 +123,4 @@ class ArrayLogger
{
return $this->lastLog;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/Config/ConfigurationLoaderTest.php b/tests/Helpers/Config/ConfigurationLoaderTest.php
index 9a5b19c6..6337a9b6 100644
--- a/tests/Helpers/Config/ConfigurationLoaderTest.php
+++ b/tests/Helpers/Config/ConfigurationLoaderTest.php
@@ -30,4 +30,4 @@ class ConfigurationLoaderTest extends TestCase
array(__DIR__ . DIRECTORY_SEPARATOR . 'test_config.json'),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/ProductCodeTest.php b/tests/Helpers/ProductCodeTest.php
index 5bcf06e9..1eb9015b 100644
--- a/tests/Helpers/ProductCodeTest.php
+++ b/tests/Helpers/ProductCodeTest.php
@@ -2,12 +2,12 @@
namespace Tests\YooKassa\Helpers;
+use PHPUnit\Framework\TestCase;
use YooKassa\Helpers\ProductCode;
use YooKassa\Model\Receipt\MarkCodeInfo;
-class ProductCodeTest extends \PHPUnit_Framework_TestCase
+class ProductCodeTest extends TestCase
{
-
/**
* @dataProvider dataProvider
* @param mixed $data
@@ -153,11 +153,11 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
$instance = new ProductCode();
$reflection = new \ReflectionClass(get_class($instance));
- $method = $reflection->getMethod('base_convert');
+ $method = $reflection->getMethod('baseConvert');
$method->setAccessible(true);
$result1 = $method->invokeArgs($instance, array('numString' => $data));
- $method = $reflection->getMethod('base_convert');
+ $method = $reflection->getMethod('baseConvert');
$method->setAccessible(true);
$result2 = $method->invokeArgs($instance, array('numString' => $result1, 'fromBase' => 16, 'toBase' => 10));
@@ -522,5 +522,4 @@ class ProductCodeTest extends \PHPUnit_Framework_TestCase
),
);
}
-
}
diff --git a/tests/Helpers/RandomTest.php b/tests/Helpers/RandomTest.php
index eba79923..1b1d4661 100644
--- a/tests/Helpers/RandomTest.php
+++ b/tests/Helpers/RandomTest.php
@@ -189,4 +189,4 @@ class RandomTest extends TestCase
}
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/RawHeadersParserTest.php b/tests/Helpers/RawHeadersParserTest.php
index 3dad9a0d..74cbb7f3 100644
--- a/tests/Helpers/RawHeadersParserTest.php
+++ b/tests/Helpers/RawHeadersParserTest.php
@@ -90,4 +90,4 @@ class RawHeadersParserTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/StringObjectTest.php b/tests/Helpers/StringObjectTest.php
index 7277b7d1..46c47b35 100644
--- a/tests/Helpers/StringObjectTest.php
+++ b/tests/Helpers/StringObjectTest.php
@@ -24,4 +24,4 @@ class StringObjectTest extends TestCase
array('value'),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/TypeCastTest.php b/tests/Helpers/TypeCastTest.php
index ba3e1ac5..fe671562 100644
--- a/tests/Helpers/TypeCastTest.php
+++ b/tests/Helpers/TypeCastTest.php
@@ -148,4 +148,4 @@ class TypeCastTest extends TestCase
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Helpers/UUIDTest.php b/tests/Helpers/UUIDTest.php
index 5f34d3dd..0fbb21c5 100644
--- a/tests/Helpers/UUIDTest.php
+++ b/tests/Helpers/UUIDTest.php
@@ -2,7 +2,6 @@
namespace Tests\YooKassa\Helpers;
-
use PHPUnit\Framework\TestCase;
use YooKassa\Helpers\UUID;
@@ -11,6 +10,6 @@ class UUIDTest extends TestCase
public function testValidUuid()
{
$uuidPattern = '/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i';
- self::assertTrue(preg_match($uuidPattern , UUID::v4()) === 1);
+ self::assertTrue(preg_match($uuidPattern, UUID::v4()) === 1);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/AirlineTest.php b/tests/Model/AirlineTest.php
index 4067d91f..0524990d 100644
--- a/tests/Model/AirlineTest.php
+++ b/tests/Model/AirlineTest.php
@@ -1,9 +1,7 @@
array(
'rrn' => null,
@@ -185,14 +185,14 @@ class AuthorizationDetailsTest extends TestCase
{
$exceptionNamespace = 'YooKassa\\Common\\Exceptions\\';
return array(
- array(array(), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(fopen(__FILE__, 'r'), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(-1, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(-0.01, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(0.0, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(true, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(false, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(new \StdClass, $exceptionNamespace.'InvalidPropertyValueTypeException'),
+ array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(-1, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(-0.01, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(0.0, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(true, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(false, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(new \StdClass(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
);
}
diff --git a/tests/Model/CancellationDetailsTest.php b/tests/Model/CancellationDetailsTest.php
index ae7cadc2..035ea214 100644
--- a/tests/Model/CancellationDetailsTest.php
+++ b/tests/Model/CancellationDetailsTest.php
@@ -114,19 +114,18 @@ class CancellationDetailsTest extends TestCase
);
}
return $result;
-
}
public function invalidValueDataProvider()
{
$exceptionNamespace = 'YooKassa\\Common\\Exceptions\\';
return array(
- array(null, $exceptionNamespace.'EmptyPropertyValueException'),
- array('', $exceptionNamespace.'EmptyPropertyValueException'),
- array(array(), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(fopen(__FILE__, 'r'), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(true, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(false, $exceptionNamespace.'InvalidPropertyValueTypeException'),
+ array(null, $exceptionNamespace . 'EmptyPropertyValueException'),
+ array('', $exceptionNamespace . 'EmptyPropertyValueException'),
+ array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(true, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(false, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
);
}
diff --git a/tests/Model/Confirmation/ConfirmationCodeVerificationTest.php b/tests/Model/Confirmation/ConfirmationCodeVerificationTest.php
index bc1c2d8a..9c57dfc7 100644
--- a/tests/Model/Confirmation/ConfirmationCodeVerificationTest.php
+++ b/tests/Model/Confirmation/ConfirmationCodeVerificationTest.php
@@ -22,4 +22,4 @@ class ConfirmationCodeVerificationTest extends AbstractConfirmationTest
{
return ConfirmationType::CODE_VERIFICATION;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationEmbeddedTest.php b/tests/Model/Confirmation/ConfirmationEmbeddedTest.php
index ad80d8cc..ae2f9d2a 100644
--- a/tests/Model/Confirmation/ConfirmationEmbeddedTest.php
+++ b/tests/Model/Confirmation/ConfirmationEmbeddedTest.php
@@ -2,7 +2,6 @@
namespace Model\Confirmation;
-
use Tests\YooKassa\Model\Confirmation\AbstractConfirmationTest;
use YooKassa\Model\Confirmation\AbstractConfirmation;
use YooKassa\Model\Confirmation\ConfirmationEmbedded;
@@ -10,7 +9,6 @@ use YooKassa\Model\ConfirmationType;
class ConfirmationEmbeddedTest extends AbstractConfirmationTest
{
-
/**
* @return AbstractConfirmation
*/
@@ -86,4 +84,4 @@ class ConfirmationEmbeddedTest extends AbstractConfirmationTest
array(new \stdClass())
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationExternalTest.php b/tests/Model/Confirmation/ConfirmationExternalTest.php
index 2849f313..7c4de9a5 100644
--- a/tests/Model/Confirmation/ConfirmationExternalTest.php
+++ b/tests/Model/Confirmation/ConfirmationExternalTest.php
@@ -5,7 +5,6 @@ namespace Tests\YooKassa\Model\Confirmation;
use YooKassa\Model\Confirmation\ConfirmationExternal;
use YooKassa\Model\ConfirmationType;
-
class ConfirmationExternalTest extends AbstractConfirmationTest
{
/**
@@ -23,4 +22,4 @@ class ConfirmationExternalTest extends AbstractConfirmationTest
{
return ConfirmationType::EXTERNAL;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationFactoryTest.php b/tests/Model/Confirmation/ConfirmationFactoryTest.php
index 8c067622..229dd987 100644
--- a/tests/Model/Confirmation/ConfirmationFactoryTest.php
+++ b/tests/Model/Confirmation/ConfirmationFactoryTest.php
@@ -172,4 +172,4 @@ class ConfirmationFactoryTest extends TestCase
array(array('type' => 'test')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationMobileApplicationTest.php b/tests/Model/Confirmation/ConfirmationMobileApplicationTest.php
index 05854809..22ee565e 100644
--- a/tests/Model/Confirmation/ConfirmationMobileApplicationTest.php
+++ b/tests/Model/Confirmation/ConfirmationMobileApplicationTest.php
@@ -232,4 +232,4 @@ class ConfirmationMobileApplicationTest extends AbstractConfirmationTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationQrTest.php b/tests/Model/Confirmation/ConfirmationQrTest.php
index b7b41157..0d9b1004 100644
--- a/tests/Model/Confirmation/ConfirmationQrTest.php
+++ b/tests/Model/Confirmation/ConfirmationQrTest.php
@@ -149,4 +149,4 @@ class ConfirmationQrTest extends AbstractConfirmationTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Confirmation/ConfirmationRedirectTest.php b/tests/Model/Confirmation/ConfirmationRedirectTest.php
index 8ab7bddd..a1ed26b2 100644
--- a/tests/Model/Confirmation/ConfirmationRedirectTest.php
+++ b/tests/Model/Confirmation/ConfirmationRedirectTest.php
@@ -30,10 +30,10 @@ class ConfirmationRedirectTest extends AbstractConfirmationTest
public function testGetSetEnforce($value)
{
$instance = $this->getTestInstance();
-
+
self::assertNull($instance->getEnforce());
self::assertNull($instance->enforce);
-
+
$instance->setEnforce($value);
if ($value === null || $value === '') {
self::assertNull($instance->getEnforce());
@@ -285,4 +285,4 @@ class ConfirmationRedirectTest extends AbstractConfirmationTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/AbstractConfirmationAttributesTest.php b/tests/Model/ConfirmationAttributes/AbstractConfirmationAttributesTest.php
index e5f7e4f8..a6167590 100644
--- a/tests/Model/ConfirmationAttributes/AbstractConfirmationAttributesTest.php
+++ b/tests/Model/ConfirmationAttributes/AbstractConfirmationAttributesTest.php
@@ -117,6 +117,6 @@ class TestConfirmation extends AbstractConfirmationAttributes
{
public function __construct($type)
{
- $this->_setType($type);
+ $this->setType($type);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesEmbeddedTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesEmbeddedTest.php
index 8dae1595..d7e3410c 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesEmbeddedTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesEmbeddedTest.php
@@ -2,7 +2,6 @@
namespace Model\ConfirmationAttributes;
-
use Tests\YooKassa\Model\ConfirmationAttributes\AbstractConfirmationAttributesTest;
use YooKassa\Model\ConfirmationAttributes\AbstractConfirmationAttributes;
use YooKassa\Model\ConfirmationAttributes\ConfirmationAttributesEmbedded;
@@ -10,7 +9,6 @@ use YooKassa\Model\ConfirmationType;
class ConfirmationAttributesEmbeddedTest extends AbstractConfirmationAttributesTest
{
-
/**
* @return AbstractConfirmationAttributes
*/
@@ -26,4 +24,4 @@ class ConfirmationAttributesEmbeddedTest extends AbstractConfirmationAttributesT
{
return ConfirmationType::EMBEDDED;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesExternalTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesExternalTest.php
index 52551f86..439adc20 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesExternalTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesExternalTest.php
@@ -22,4 +22,4 @@ class ConfirmationAttributesExternalTest extends AbstractConfirmationAttributesT
{
return ConfirmationType::EXTERNAL;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesFactoryTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesFactoryTest.php
index 170debbd..cf2b0189 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesFactoryTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesFactoryTest.php
@@ -145,4 +145,4 @@ class ConfirmationAttributesFactoryTest extends TestCase
array(array('type' => 'test')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplicationTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplicationTest.php
index 0f098db2..41af805e 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplicationTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesMobileApplicationTest.php
@@ -153,4 +153,4 @@ class ConfirmationAttributesMobileApplicationTest extends AbstractConfirmationAt
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesQrTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesQrTest.php
index 61178b03..aec81f8a 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesQrTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesQrTest.php
@@ -22,4 +22,4 @@ class ConfirmationAttributesQrTest extends AbstractConfirmationAttributesTest
{
return ConfirmationType::QR;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ConfirmationAttributes/ConfirmationAttributesRedirectTest.php b/tests/Model/ConfirmationAttributes/ConfirmationAttributesRedirectTest.php
index 0909e8b0..3ece51d3 100644
--- a/tests/Model/ConfirmationAttributes/ConfirmationAttributesRedirectTest.php
+++ b/tests/Model/ConfirmationAttributes/ConfirmationAttributesRedirectTest.php
@@ -206,4 +206,4 @@ class ConfirmationAttributesRedirectTest extends AbstractConfirmationAttributesT
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Deal/CaptureDealDataTest.php b/tests/Model/Deal/CaptureDealDataTest.php
index be0a2fa8..57ac1fea 100644
--- a/tests/Model/Deal/CaptureDealDataTest.php
+++ b/tests/Model/Deal/CaptureDealDataTest.php
@@ -10,7 +10,6 @@ use YooKassa\Model\Deal\SettlementPayoutPaymentType;
class CaptureDealDataTest extends TestCase
{
-
/**
* @dataProvider fromArrayDataProvider
* @param array $source
@@ -110,7 +109,7 @@ class CaptureDealDataTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateSettlement();
}
@@ -127,5 +126,4 @@ class CaptureDealDataTest extends TestCase
),
);
}
-
}
diff --git a/tests/Model/Deal/DealBalanceAmountTest.php b/tests/Model/Deal/DealBalanceAmountTest.php
index 3ea57447..bb3735c7 100644
--- a/tests/Model/Deal/DealBalanceAmountTest.php
+++ b/tests/Model/Deal/DealBalanceAmountTest.php
@@ -167,7 +167,7 @@ class DealBalanceAmountTest extends TestCase
$result = array();
foreach (range(1, 10) as $i) {
$result[$i][] = array(
- 'value' => Random::value(array('-', '')).Random::float(0, 9999.99),
+ 'value' => Random::value(array('-', '')) . Random::float(0, 9999.99),
'currency' => Random::value(CurrencyCode::getValidValues()),
);
}
@@ -190,7 +190,7 @@ class DealBalanceAmountTest extends TestCase
array('-100'),
);
for ($i = 0; $i < 10; $i++) {
- $result[] = array(Random::value(array('-', '')).Random::float(0, 9999999));
+ $result[] = array(Random::value(array('-', '')) . Random::float(0, 9999999));
}
return $result;
}
diff --git a/tests/Model/Deal/PaymentDealInfoTest.php b/tests/Model/Deal/PaymentDealInfoTest.php
index 8b34f7ea..130087f7 100644
--- a/tests/Model/Deal/PaymentDealInfoTest.php
+++ b/tests/Model/Deal/PaymentDealInfoTest.php
@@ -136,7 +136,7 @@ class PaymentDealInfoTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateSettlement();
}
@@ -153,5 +153,4 @@ class PaymentDealInfoTest extends TestCase
),
);
}
-
}
diff --git a/tests/Model/Deal/PayoutDealInfoTest.php b/tests/Model/Deal/PayoutDealInfoTest.php
index 8621f274..7664f1e3 100644
--- a/tests/Model/Deal/PayoutDealInfoTest.php
+++ b/tests/Model/Deal/PayoutDealInfoTest.php
@@ -96,5 +96,4 @@ class PayoutDealInfoTest extends TestCase
),
);
}
-
}
diff --git a/tests/Model/Deal/RefundDealDataTest.php b/tests/Model/Deal/RefundDealDataTest.php
index 61bf0a19..1feb6e06 100644
--- a/tests/Model/Deal/RefundDealDataTest.php
+++ b/tests/Model/Deal/RefundDealDataTest.php
@@ -10,7 +10,6 @@ use YooKassa\Model\Deal\SettlementPayoutPaymentType;
class RefundDealDataTest extends TestCase
{
-
/**
* @dataProvider fromArrayDataProvider
* @param array $source
@@ -110,7 +109,7 @@ class RefundDealDataTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateRefundSettlement();
}
@@ -127,5 +126,4 @@ class RefundDealDataTest extends TestCase
),
);
}
-
}
diff --git a/tests/Model/Deal/RefundDealInfoTest.php b/tests/Model/Deal/RefundDealInfoTest.php
index 0432d830..3c45ce27 100644
--- a/tests/Model/Deal/RefundDealInfoTest.php
+++ b/tests/Model/Deal/RefundDealInfoTest.php
@@ -136,7 +136,7 @@ class RefundDealInfoTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateRefundSettlement();
}
@@ -153,5 +153,4 @@ class RefundDealInfoTest extends TestCase
),
);
}
-
}
diff --git a/tests/Model/Deal/SettlementPayoutPaymentTest.php b/tests/Model/Deal/SettlementPayoutPaymentTest.php
index 290eed02..91665a9b 100644
--- a/tests/Model/Deal/SettlementPayoutPaymentTest.php
+++ b/tests/Model/Deal/SettlementPayoutPaymentTest.php
@@ -191,5 +191,4 @@ class SettlementPayoutPaymentTest extends TestCase
return $result;
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Model/FraudDataTest.php b/tests/Model/FraudDataTest.php
new file mode 100644
index 00000000..369c4461
--- /dev/null
+++ b/tests/Model/FraudDataTest.php
@@ -0,0 +1,66 @@
+getToppedUpPhone());
+ self::assertNull($instance->topped_up_phone);
+
+ $instance->setToppedUpPhone($options['topped_up_phone']);
+ self::assertEquals($options['topped_up_phone'], $instance->getToppedUpPhone());
+ self::assertEquals($options['topped_up_phone'], $instance->topped_up_phone);
+
+ $instance = new FraudData();
+ $instance->topped_up_phone = $options['topped_up_phone'];
+ self::assertEquals($options['topped_up_phone'], $instance->getToppedUpPhone());
+ self::assertEquals($options['topped_up_phone'], $instance->topped_up_phone);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidToppedUpPhone($value)
+ {
+ $instance = new FraudData();
+ $instance->setToppedUpPhone($value);
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+ $result[] = array(array('topped_up_phone' => null));
+ $result[] = array(array('topped_up_phone' => ''));
+ for ($i = 0; $i < 10; $i++) {
+ $payment = array(
+ 'topped_up_phone' => Random::str(11, 15, '0123456789'),
+ );
+ $result[] = array($payment);
+ }
+ return $result;
+ }
+
+ public function invalidDataProvider()
+ {
+ return array(
+ array(new \stdClass()),
+ array(true),
+ array(false),
+ array(array(123)),
+ array(Random::str(16, 30, '0123456789')),
+ );
+ }
+}
diff --git a/tests/Model/LegTest.php b/tests/Model/LegTest.php
index 29e85920..e3500e0c 100644
--- a/tests/Model/LegTest.php
+++ b/tests/Model/LegTest.php
@@ -1,9 +1,7 @@
getDepartureAirport());
self::assertEquals($data["destination_airport"], $leg->getDestinationAirport());
self::assertEquals($data["departure_date"], $leg->getDepartureDate());
-
}
/**
@@ -106,4 +103,4 @@ class LegTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/MetadataTest.php b/tests/Model/MetadataTest.php
index e1103a25..ab418dca 100644
--- a/tests/Model/MetadataTest.php
+++ b/tests/Model/MetadataTest.php
@@ -86,4 +86,4 @@ class MetadataTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Notification/AbstractNotificationTest.php b/tests/Model/Notification/AbstractNotificationTest.php
index d384763d..3dc53446 100644
--- a/tests/Model/Notification/AbstractNotificationTest.php
+++ b/tests/Model/Notification/AbstractNotificationTest.php
@@ -140,7 +140,7 @@ class TestNotification extends AbstractNotification
{
public function __construct($type, $event)
{
- $this->_setType($type);
- $this->_setEvent($event);
+ $this->setType($type);
+ $this->setEvent($event);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Notification/NotificationCanceledTest.php b/tests/Model/Notification/NotificationCanceledTest.php
index 5c5d7d4d..41215b97 100644
--- a/tests/Model/Notification/NotificationCanceledTest.php
+++ b/tests/Model/Notification/NotificationCanceledTest.php
@@ -1,8 +1,8 @@
getRefundNotification();
break;
@@ -316,5 +316,4 @@ class NotificationFactoryTest extends TestCase
break;
}
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Notification/NotificationPayoutCanceledTest.php b/tests/Model/Notification/NotificationPayoutCanceledTest.php
index 4eea8813..c2f278f5 100644
--- a/tests/Model/Notification/NotificationPayoutCanceledTest.php
+++ b/tests/Model/Notification/NotificationPayoutCanceledTest.php
@@ -124,4 +124,4 @@ class NotificationPayoutCanceledTest extends AbstractNotificationTest
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Notification/NotificationPayoutSucceededTest.php b/tests/Model/Notification/NotificationPayoutSucceededTest.php
index 62137758..549b1c66 100644
--- a/tests/Model/Notification/NotificationPayoutSucceededTest.php
+++ b/tests/Model/Notification/NotificationPayoutSucceededTest.php
@@ -110,4 +110,4 @@ class NotificationPayoutSucceededTest extends AbstractNotificationTest
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Notification/NotificationRefundSucceededTest.php b/tests/Model/Notification/NotificationRefundSucceededTest.php
index 42f020b2..1e93f5f2 100644
--- a/tests/Model/Notification/NotificationRefundSucceededTest.php
+++ b/tests/Model/Notification/NotificationRefundSucceededTest.php
@@ -1,6 +1,5 @@
_setType($type);
+ $this->setType($type);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/B2b/Sberbank/VatDataTest.php b/tests/Model/PaymentData/B2b/Sberbank/VatDataTest.php
index 46cb8c28..eb5b4eff 100644
--- a/tests/Model/PaymentData/B2b/Sberbank/VatDataTest.php
+++ b/tests/Model/PaymentData/B2b/Sberbank/VatDataTest.php
@@ -31,7 +31,6 @@ class VatDataTest extends TestCase
self::assertEquals($value['type'], $instance->getType());
self::assertEquals($value['rate'], $instance->getRate());
self::assertEquals($value['amount']->getValue(), $instance->getAmount()->getValue());
-
}
/**
@@ -245,8 +244,8 @@ class VatDataTest extends TestCase
*/
protected function getAndSetTest($value, $property, $snakeCase = null)
{
- $getter = 'get'.ucfirst($property);
- $setter = 'set'.ucfirst($property);
+ $getter = 'get' . ucfirst($property);
+ $setter = 'set' . ucfirst($property);
$instance = $this->getTestInstance();
@@ -284,4 +283,4 @@ class VatDataTest extends TestCase
self::assertEquals($value, $instance->{$snakeCase});
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataAlfabankTest.php b/tests/Model/PaymentData/PaymentDataAlfabankTest.php
index 9ff685e5..bdd37378 100644
--- a/tests/Model/PaymentData/PaymentDataAlfabankTest.php
+++ b/tests/Model/PaymentData/PaymentDataAlfabankTest.php
@@ -87,4 +87,4 @@ class PaymentDataAlfabankTest extends AbstractPaymentDataTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataApplePayTest.php b/tests/Model/PaymentData/PaymentDataApplePayTest.php
index 46c31d0e..b4c45e43 100644
--- a/tests/Model/PaymentData/PaymentDataApplePayTest.php
+++ b/tests/Model/PaymentData/PaymentDataApplePayTest.php
@@ -22,4 +22,4 @@ class PaymentDataApplePayTest extends AbstractPaymentDataApplePayTest
{
return PaymentMethodType::APPLE_PAY;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataB2bSberbankTest.php b/tests/Model/PaymentData/PaymentDataB2bSberbankTest.php
index e06756a9..28f42468 100644
--- a/tests/Model/PaymentData/PaymentDataB2bSberbankTest.php
+++ b/tests/Model/PaymentData/PaymentDataB2bSberbankTest.php
@@ -104,8 +104,10 @@ class PaymentDataB2bSberbankTest extends AbstractPaymentDataTest
}
if (isset($value['amount'])) {
if (is_array($value['amount'])) {
- self::assertEquals($value['amount']['value'],
- (int)$instance->getVatData()->getAmount()->getValue());
+ self::assertEquals(
+ $value['amount']['value'],
+ (int)$instance->getVatData()->getAmount()->getValue()
+ );
self::assertEquals($value['amount']['currency'], $instance->vatData->getAmount()->getCurrency());
} else {
self::assertEquals($value['amount'], $instance->getVatData()->getAmount());
@@ -192,4 +194,4 @@ class PaymentDataB2bSberbankTest extends AbstractPaymentDataTest
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataBankCardCardTest.php b/tests/Model/PaymentData/PaymentDataBankCardCardTest.php
index beb3f74d..dc80f1d2 100644
--- a/tests/Model/PaymentData/PaymentDataBankCardCardTest.php
+++ b/tests/Model/PaymentData/PaymentDataBankCardCardTest.php
@@ -248,7 +248,7 @@ class PaymentDataBankCardCardTest extends TestCase
}
return $result;
}
-
+
public function invalidNumberDataProvider()
{
return array(
@@ -381,4 +381,4 @@ class PaymentDataBankCardCardTest extends TestCase
self::assertEquals($value, $instance->{$snakeCase});
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataBankCardTest.php b/tests/Model/PaymentData/PaymentDataBankCardTest.php
index 9666eca6..7e97e72d 100644
--- a/tests/Model/PaymentData/PaymentDataBankCardTest.php
+++ b/tests/Model/PaymentData/PaymentDataBankCardTest.php
@@ -116,4 +116,4 @@ class PaymentDataBankCardTest extends AbstractPaymentDataTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataCashTest.php b/tests/Model/PaymentData/PaymentDataCashTest.php
index 4cf25eb2..2be03fb2 100644
--- a/tests/Model/PaymentData/PaymentDataCashTest.php
+++ b/tests/Model/PaymentData/PaymentDataCashTest.php
@@ -53,4 +53,4 @@ class PaymentDataCashTest extends AbstractPaymentDataPhoneTest
array('2345678901234567'),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataGooglePayTest.php b/tests/Model/PaymentData/PaymentDataGooglePayTest.php
index 20e357dd..05a22581 100644
--- a/tests/Model/PaymentData/PaymentDataGooglePayTest.php
+++ b/tests/Model/PaymentData/PaymentDataGooglePayTest.php
@@ -22,4 +22,4 @@ class PaymentDataGooglePayTest extends AbstractPaymentDataGooglePayTest
{
return PaymentMethodType::GOOGLE_PAY;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataInstallmentsTest.php b/tests/Model/PaymentData/PaymentDataInstallmentsTest.php
index 1d757a69..9d1d3fe6 100644
--- a/tests/Model/PaymentData/PaymentDataInstallmentsTest.php
+++ b/tests/Model/PaymentData/PaymentDataInstallmentsTest.php
@@ -22,4 +22,4 @@ class PaymentDataInstallmentsTest extends AbstractPaymentDataTest
{
return PaymentMethodType::INSTALLMENTS;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataMobileBalanceTest.php b/tests/Model/PaymentData/PaymentDataMobileBalanceTest.php
index 22a0f58c..9e30ffea 100644
--- a/tests/Model/PaymentData/PaymentDataMobileBalanceTest.php
+++ b/tests/Model/PaymentData/PaymentDataMobileBalanceTest.php
@@ -22,4 +22,4 @@ class PaymentDataMobileBalanceTest extends AbstractPaymentDataPhoneTest
{
return PaymentMethodType::MOBILE_BALANCE;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataQiwiTest.php b/tests/Model/PaymentData/PaymentDataQiwiTest.php
index 057fe587..ed87f178 100644
--- a/tests/Model/PaymentData/PaymentDataQiwiTest.php
+++ b/tests/Model/PaymentData/PaymentDataQiwiTest.php
@@ -22,4 +22,4 @@ class PaymentDataQiwiTest extends AbstractPaymentDataPhoneTest
{
return PaymentMethodType::QIWI;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataSberbankTest.php b/tests/Model/PaymentData/PaymentDataSberbankTest.php
index 3a1fee10..f8ac2b47 100644
--- a/tests/Model/PaymentData/PaymentDataSberbankTest.php
+++ b/tests/Model/PaymentData/PaymentDataSberbankTest.php
@@ -22,4 +22,4 @@ class PaymentDataSberbankTest extends AbstractPaymentDataPhoneTest
{
return PaymentMethodType::SBERBANK;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentData/PaymentDataTinkoffBankTest.php b/tests/Model/PaymentData/PaymentDataTinkoffBankTest.php
index 507d6e1b..7bfa7981 100644
--- a/tests/Model/PaymentData/PaymentDataTinkoffBankTest.php
+++ b/tests/Model/PaymentData/PaymentDataTinkoffBankTest.php
@@ -1,16 +1,13 @@
_setType($type);
+ $this->setType($type);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsTest.php b/tests/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsTest.php
index f83fb3d0..7f208d0a 100644
--- a/tests/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsTest.php
+++ b/tests/Model/PaymentMethod/B2b/Sberbank/PayerBankDetailsTest.php
@@ -115,8 +115,8 @@ class PayerBankDetailsTest extends TestCase
*/
protected function getAndSetTest($value, $property, $snakeCase = null)
{
- $getter = 'get'.ucfirst($property);
- $setter = 'set'.ucfirst($property);
+ $getter = 'get' . ucfirst($property);
+ $setter = 'set' . ucfirst($property);
$instance = $this->getTestInstance();
@@ -154,4 +154,4 @@ class PayerBankDetailsTest extends TestCase
self::assertEquals($value, $instance->{$snakeCase});
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodAlfaBankTest.php b/tests/Model/PaymentMethod/PaymentMethodAlfaBankTest.php
index e137f7b5..aef8519a 100644
--- a/tests/Model/PaymentMethod/PaymentMethodAlfaBankTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodAlfaBankTest.php
@@ -87,4 +87,4 @@ class PaymentMethodAlfaBankTest extends AbstractPaymentMethodTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodApplePayTest.php b/tests/Model/PaymentMethod/PaymentMethodApplePayTest.php
index cf008e2b..020587fe 100644
--- a/tests/Model/PaymentMethod/PaymentMethodApplePayTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodApplePayTest.php
@@ -22,4 +22,4 @@ class PaymentMethodApplePayTest extends AbstractPaymentMethodTest
{
return PaymentMethodType::APPLE_PAY;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodBankCardTest.php b/tests/Model/PaymentMethod/PaymentMethodBankCardTest.php
index 26dc247b..45f8cb49 100644
--- a/tests/Model/PaymentMethod/PaymentMethodBankCardTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodBankCardTest.php
@@ -86,7 +86,7 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
{
$instance = $this->getTestInstance();
$instance->setCard($value['card']);
- $this->getOnlyTest($instance, $value['card'],'expiryMonth', 'expiry_month');
+ $this->getOnlyTest($instance, $value['card'], 'expiryMonth', 'expiry_month');
}
/**
@@ -97,7 +97,7 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
{
$instance = $this->getTestInstance();
$instance->setCard($value['card']);
- $this->getOnlyTest($instance, $value['card'],'cardType', 'card_type');
+ $this->getOnlyTest($instance, $value['card'], 'cardType', 'card_type');
}
/**
@@ -108,7 +108,7 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
{
$instance = $this->getTestInstance();
$instance->setCard($value['card']);
- $this->getOnlyTest($instance, $value['card'],'issuerCountry', 'issuer_country');
+ $this->getOnlyTest($instance, $value['card'], 'issuerCountry', 'issuer_country');
}
/**
@@ -119,7 +119,7 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
{
$instance = $this->getTestInstance();
$instance->setCard($value['card']);
- $this->getOnlyTest($instance, $value['card'],'issuerName', 'issuer_name');
+ $this->getOnlyTest($instance, $value['card'], 'issuerName', 'issuer_name');
}
/**
@@ -130,7 +130,7 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
{
$instance = $this->getTestInstance();
$instance->setCard($value['card']);
- $this->getOnlyTest($instance, $value['card'],'source', 'source');
+ $this->getOnlyTest($instance, $value['card'], 'source', 'source');
}
@@ -155,7 +155,6 @@ class PaymentMethodBankCardTest extends AbstractPaymentMethodTest
)
)
);
-
}
return $result;
}
diff --git a/tests/Model/PaymentMethod/PaymentMethodCashTest.php b/tests/Model/PaymentMethod/PaymentMethodCashTest.php
index 1cc819b5..e49c30db 100644
--- a/tests/Model/PaymentMethod/PaymentMethodCashTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodCashTest.php
@@ -22,4 +22,4 @@ class PaymentMethodCashTest extends AbstractPaymentMethodTest
{
return PaymentMethodType::CASH;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodGooglePayTest.php b/tests/Model/PaymentMethod/PaymentMethodGooglePayTest.php
index b41f79e9..df8fcf8b 100644
--- a/tests/Model/PaymentMethod/PaymentMethodGooglePayTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodGooglePayTest.php
@@ -22,4 +22,4 @@ class PaymentMethodGooglePayTest extends AbstractPaymentMethodTest
{
return PaymentMethodType::GOOGLE_PAY;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodInstallmentsTest.php b/tests/Model/PaymentMethod/PaymentMethodInstallmentsTest.php
index 151eb738..ac4bab21 100644
--- a/tests/Model/PaymentMethod/PaymentMethodInstallmentsTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodInstallmentsTest.php
@@ -22,4 +22,4 @@ class PaymentMethodInstallmentsTest extends AbstractPaymentMethodTest
{
return PaymentMethodType::INSTALLMENTS;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodMobileBalanceTest.php b/tests/Model/PaymentMethod/PaymentMethodMobileBalanceTest.php
index 6eb3ee40..0bca163e 100644
--- a/tests/Model/PaymentMethod/PaymentMethodMobileBalanceTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodMobileBalanceTest.php
@@ -22,4 +22,4 @@ class PaymentMethodMobileBalanceTest extends AbstractPaymentMethodPhoneTest
{
return PaymentMethodType::MOBILE_BALANCE;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodQiwiTest.php b/tests/Model/PaymentMethod/PaymentMethodQiwiTest.php
index 4a78c398..79aaaffb 100644
--- a/tests/Model/PaymentMethod/PaymentMethodQiwiTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodQiwiTest.php
@@ -22,4 +22,4 @@ class PaymentMethodQiwiTest extends AbstractPaymentMethodTest
{
return PaymentMethodType::QIWI;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PaymentMethod/PaymentMethodTinkoffBankTest.php b/tests/Model/PaymentMethod/PaymentMethodTinkoffBankTest.php
index f574560f..5e00354f 100644
--- a/tests/Model/PaymentMethod/PaymentMethodTinkoffBankTest.php
+++ b/tests/Model/PaymentMethod/PaymentMethodTinkoffBankTest.php
@@ -1,16 +1,13 @@
cancellationDetails);
self::assertSame($options['cancellation_details'], $instance->cancellation_details);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/AbstractPayoutDestinationTest.php b/tests/Model/Payout/AbstractPayoutDestinationTest.php
index d085af8a..046a6e2b 100644
--- a/tests/Model/Payout/AbstractPayoutDestinationTest.php
+++ b/tests/Model/Payout/AbstractPayoutDestinationTest.php
@@ -54,6 +54,6 @@ class TestPaymentData extends AbstractPayoutDestination
{
public function __construct($type)
{
- $this->_setType($type);
+ $this->setType($type);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/IncomeReceiptTest.php b/tests/Model/Payout/IncomeReceiptTest.php
new file mode 100644
index 00000000..e9e4de05
--- /dev/null
+++ b/tests/Model/Payout/IncomeReceiptTest.php
@@ -0,0 +1,298 @@
+getAmount());
+ self::assertNull($instance->amount);
+
+ $instance->setAmount($options['amount']);
+ if (empty($options['amount'])) {
+ self::assertNull($instance->getAmount());
+ self::assertNull($instance->amount);
+ } else {
+ if (is_array($options['amount'])) {
+ self::assertEquals($options['amount'], $instance->getAmount()->toArray());
+ self::assertEquals($options['amount'], $instance->amount->toArray());
+ } else {
+ self::assertEquals($options['amount'], $instance->getAmount());
+ self::assertEquals($options['amount'], $instance->amount);
+ }
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testSetterAmount($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getAmount());
+ self::assertNull($instance->amount);
+
+ $instance->amount = $options['amount'];
+ if (empty($options['amount'])) {
+ self::assertNull($instance->getAmount());
+ self::assertNull($instance->amount);
+ } else {
+ if (is_array($options['amount'])) {
+ self::assertEquals($options['amount'], $instance->getAmount()->toArray());
+ self::assertEquals($options['amount'], $instance->amount->toArray());
+ } else {
+ self::assertEquals($options['amount'], $instance->getAmount());
+ self::assertEquals($options['amount'], $instance->amount);
+ }
+ }
+ }
+
+ /**
+ * @dataProvider invalidAmountProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidAmount($value)
+ {
+ $instance = new IncomeReceipt();
+ $instance->setAmount($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testGetSetServiceName($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getServiceName());
+ self::assertNull($instance->service_name);
+ self::assertNull($instance->serviceName);
+
+ $instance->setServiceName($options['service_name']);
+ self::assertEquals($options['service_name'], $instance->getServiceName());
+ self::assertEquals($options['service_name'], $instance->service_name);
+ self::assertEquals($options['service_name'], $instance->serviceName);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testSetterServiceName($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getServiceName());
+ self::assertNull($instance->service_name);
+ self::assertNull($instance->serviceName);
+
+ $instance->service_name = $options['service_name'];
+ self::assertEquals($options['service_name'], $instance->getServiceName());
+ self::assertEquals($options['service_name'], $instance->service_name);
+ self::assertEquals($options['service_name'], $instance->serviceName);
+
+ $instance->serviceName = $options['service_name'];
+ self::assertEquals($options['service_name'], $instance->getServiceName());
+ self::assertEquals($options['service_name'], $instance->service_name);
+ self::assertEquals($options['service_name'], $instance->serviceName);
+ }
+
+ /**
+ * @dataProvider invalidServiceNameProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidServiceName($value)
+ {
+ $instance = new IncomeReceipt();
+ $instance->setServiceName($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testGetSetNpdReceiptId($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getNpdReceiptId());
+ self::assertNull($instance->npd_receipt_id);
+ self::assertNull($instance->npdReceiptId);
+
+ $instance->setNpdReceiptId($options['npd_receipt_id']);
+ self::assertEquals($options['npd_receipt_id'], $instance->getNpdReceiptId());
+ self::assertEquals($options['npd_receipt_id'], $instance->npd_receipt_id);
+ self::assertEquals($options['npd_receipt_id'], $instance->npdReceiptId);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testSetterNpdReceiptId($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getNpdReceiptId());
+ self::assertNull($instance->npd_receipt_id);
+ self::assertNull($instance->npdReceiptId);
+
+ $instance->npd_receipt_id = $options['npd_receipt_id'];
+ self::assertEquals($options['npd_receipt_id'], $instance->getNpdReceiptId());
+ self::assertEquals($options['npd_receipt_id'], $instance->npd_receipt_id);
+ self::assertEquals($options['npd_receipt_id'], $instance->npdReceiptId);
+
+ $instance->npdReceiptId = $options['npd_receipt_id'];
+ self::assertEquals($options['npd_receipt_id'], $instance->getNpdReceiptId());
+ self::assertEquals($options['npd_receipt_id'], $instance->npd_receipt_id);
+ self::assertEquals($options['npd_receipt_id'], $instance->npdReceiptId);
+ }
+
+ /**
+ * @dataProvider invalidStringProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidNpdReceiptId($value)
+ {
+ $instance = new IncomeReceipt();
+ $instance->setNpdReceiptId($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testGetSetUrl($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getUrl());
+ self::assertNull($instance->url);
+
+ $instance->setUrl($options['url']);
+ self::assertEquals($options['url'], $instance->getUrl());
+ self::assertEquals($options['url'], $instance->url);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testSetterUrl($options)
+ {
+ $instance = new IncomeReceipt();
+
+ self::assertNull($instance->getUrl());
+ self::assertNull($instance->url);
+
+ $instance->url = $options['url'];
+ self::assertEquals($options['url'], $instance->getUrl());
+ self::assertEquals($options['url'], $instance->url);
+ }
+
+ /**
+ * @dataProvider invalidStringProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidUrl($value)
+ {
+ $instance = new IncomeReceipt();
+ $instance->setUrl($value);
+ }
+
+ public function validDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => null,
+ 'url' => null,
+ 'amount' => null,
+ ),
+ ),
+ array(
+ array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => '',
+ 'url' => Random::str(1, 50),
+ 'amount' => array(),
+ ),
+ ),
+ array(
+ array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => Random::str(1, 50),
+ 'url' => '',
+ 'amount' => new MonetaryAmount(Random::int(1, 1000000)),
+ ),
+ ),
+ );
+ for ($i = 1; $i < 6; $i++) {
+ $receipt = array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => Random::str(1, 50),
+ 'url' => Random::str(1, 50),
+ 'amount' => array(
+ 'value' => round(Random::float(0.1, 99.99), 2),
+ 'currency' => Random::value(CurrencyCode::getValidValues())
+ ),
+ );
+ $result[] = array($receipt);
+ }
+ return $result;
+ }
+
+ public function invalidServiceNameProvider()
+ {
+ return array(
+ array(null),
+ array(''),
+ array(new \stdClass()),
+ array(true),
+ array(false),
+ array(array()),
+ array(Random::str(IncomeReceipt::MAX_LENGTH_SERVICE_NAME + 1, 60)),
+ );
+ }
+
+ public function invalidStringProvider()
+ {
+ return array(
+ array(new \stdClass()),
+ array(true),
+ array(false),
+ array(array()),
+ );
+ }
+
+ public function invalidAmountProvider()
+ {
+ return array(
+ array(new \stdClass()),
+ array(true),
+ array(false),
+ );
+ }
+
+}
diff --git a/tests/Model/Payout/PayoutCancellationDetailsTest.php b/tests/Model/Payout/PayoutCancellationDetailsTest.php
index 4168159f..9d81e3cb 100644
--- a/tests/Model/Payout/PayoutCancellationDetailsTest.php
+++ b/tests/Model/Payout/PayoutCancellationDetailsTest.php
@@ -3,9 +3,8 @@
namespace Tests\YooKassa\Model\Payout;
use PHPUnit\Framework\TestCase;
-use YooKassa\Model\CancellationDetails;
-use YooKassa\Model\CancellationDetailsPartyCode;
-use YooKassa\Model\CancellationDetailsReasonCode;
+use YooKassa\Model\Payout\PayoutCancellationDetailsPartyCode;
+use YooKassa\Model\Payout\PayoutCancellationDetailsReasonCode;
use YooKassa\Model\Payout\PayoutCancellationDetails;
class PayoutCancellationDetailsTest extends TestCase
@@ -100,9 +99,9 @@ class PayoutCancellationDetailsTest extends TestCase
public function validDataProvider()
{
$result = array();
- $cancellationDetailsParties = CancellationDetailsPartyCode::getValidValues();
+ $cancellationDetailsParties = PayoutCancellationDetailsPartyCode::getValidValues();
$countCancellationDetailsParties = count($cancellationDetailsParties);
- $cancellationDetailsReasons = CancellationDetailsReasonCode::getValidValues();
+ $cancellationDetailsReasons = PayoutCancellationDetailsReasonCode::getValidValues();
$countCancellationDetailsReasons = count($cancellationDetailsReasons);
for ($i = 0; $i < 20; $i++) {
$result[] = array(
@@ -113,19 +112,18 @@ class PayoutCancellationDetailsTest extends TestCase
);
}
return $result;
-
}
public function invalidValueDataProvider()
{
$exceptionNamespace = 'YooKassa\\Common\\Exceptions\\';
return array(
- array(null, $exceptionNamespace.'EmptyPropertyValueException'),
- array('', $exceptionNamespace.'EmptyPropertyValueException'),
- array(array(), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(fopen(__FILE__, 'r'), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(true, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(false, $exceptionNamespace.'InvalidPropertyValueTypeException'),
+ array(null, $exceptionNamespace . 'EmptyPropertyValueException'),
+ array('', $exceptionNamespace . 'EmptyPropertyValueException'),
+ array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(true, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(false, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
);
}
diff --git a/tests/Model/Payout/PayoutDestinationBankCardCardTest.php b/tests/Model/Payout/PayoutDestinationBankCardCardTest.php
index 023da88d..3c92c6ab 100644
--- a/tests/Model/Payout/PayoutDestinationBankCardCardTest.php
+++ b/tests/Model/Payout/PayoutDestinationBankCardCardTest.php
@@ -362,4 +362,4 @@ class PayoutDestinationBankCardCardTest extends TestCase
self::assertEquals($value, $instance->{$snakeCase});
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/PayoutDestinationBankCardTest.php b/tests/Model/Payout/PayoutDestinationBankCardTest.php
index de070f9d..6b0893ab 100644
--- a/tests/Model/Payout/PayoutDestinationBankCardTest.php
+++ b/tests/Model/Payout/PayoutDestinationBankCardTest.php
@@ -120,4 +120,4 @@ class PayoutDestinationBankCardTest extends AbstractPayoutDestinationTest
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/PayoutDestinationFactoryTest.php b/tests/Model/Payout/PayoutDestinationFactoryTest.php
index 9f2b60c7..562172d1 100644
--- a/tests/Model/Payout/PayoutDestinationFactoryTest.php
+++ b/tests/Model/Payout/PayoutDestinationFactoryTest.php
@@ -128,7 +128,14 @@ class PayoutDestinationFactoryTest extends TestCase
array(
array(
'type' => PaymentMethodType::YOO_MONEY,
- 'account_number' => Random::str(11, 33, '1234567890')
+ 'account_number' => Random::str(11, 33, '1234567890'),
+ ),
+ ),
+ array(
+ array(
+ 'type' => PaymentMethodType::SBP,
+ 'phone' => Random::str(4, 16, '1234567890'),
+ 'bank_id' => Random::str(4, 12),
),
),
);
@@ -145,4 +152,4 @@ class PayoutDestinationFactoryTest extends TestCase
array(array('type' => 'test')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/PayoutDestinationSbpTest.php b/tests/Model/Payout/PayoutDestinationSbpTest.php
new file mode 100644
index 00000000..bc853ccf
--- /dev/null
+++ b/tests/Model/Payout/PayoutDestinationSbpTest.php
@@ -0,0 +1,256 @@
+getTestInstance();
+
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $instance->setPhone($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getPhone());
+ self::assertEquals($expected, $instance->phone);
+ }
+
+ $instance = $this->getTestInstance();
+ $instance->phone = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getPhone());
+ self::assertEquals($expected, $instance->phone);
+ }
+ }
+
+ /**
+ * @dataProvider invalidPhoneDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetInvalidPhone($value)
+ {
+ $this->getTestInstance()->setPhone($value);
+ }
+
+ /**
+ * @dataProvider invalidPhoneDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetterInvalidPhone($value)
+ {
+ $this->getTestInstance()->phone = $value;
+ }
+
+ /**
+ * @dataProvider validBankIdDataProvider
+ * @param string $value
+ */
+ public function testGetSetBankId($value)
+ {
+ $instance = $this->getTestInstance();
+
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+
+ $instance->setBankId($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getBankId());
+ self::assertEquals($expected, $instance->bankId);
+ self::assertEquals($expected, $instance->bank_id);
+ }
+
+ $instance = $this->getTestInstance();
+ $instance->bankId = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getBankId());
+ self::assertEquals($expected, $instance->bankId);
+ self::assertEquals($expected, $instance->bank_id);
+ }
+ }
+
+ /**
+ * @dataProvider invalidBankIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetInvalidBankId($value)
+ {
+ $this->getTestInstance()->setBankId($value);
+ }
+
+ /**
+ * @dataProvider invalidBankIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetterInvalidBankId($value)
+ {
+ $this->getTestInstance()->bankId = $value;
+ }
+
+ /**
+ * @dataProvider validRecipientCheckedDataProvider
+ * @param string $value
+ */
+ public function testGetSetRecipientChecked($value)
+ {
+ $instance = $this->getTestInstance();
+
+ self::assertNull($instance->getRecipientChecked());
+ self::assertNull($instance->recipientChecked);
+ self::assertNull($instance->recipient_checked);
+
+ $instance->setRecipientChecked($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getRecipientChecked());
+ self::assertNull($instance->recipientChecked);
+ self::assertNull($instance->recipient_checked);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getRecipientChecked());
+ self::assertEquals($expected, $instance->recipientChecked);
+ self::assertEquals($expected, $instance->recipient_checked);
+ }
+
+ $instance = $this->getTestInstance();
+ $instance->recipientChecked = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getRecipientChecked());
+ self::assertNull($instance->recipientChecked);
+ self::assertNull($instance->recipient_checked);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getRecipientChecked());
+ self::assertEquals($expected, $instance->recipientChecked);
+ self::assertEquals($expected, $instance->recipient_checked);
+ }
+ }
+
+ /**
+ * @dataProvider invalidRecipientCheckedDataProvider
+ * @param mixed $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidRecipientChecked($value)
+ {
+ $this->getTestInstance()->recipientChecked = $value;
+ }
+
+ /**
+ * @dataProvider invalidRecipientCheckedDataProvider
+ * @param mixed $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSettterInvalidRecipientChecked($value)
+ {
+ $this->getTestInstance()->setRecipientChecked($value);
+ }
+
+ public function validPhoneDataProvider()
+ {
+ return array(
+ array(Random::str(4, 16, '0123456789')),
+ array(Random::str(4, 16, '0123456789')),
+ );
+ }
+
+ public function invalidPhoneDataProvider()
+ {
+ return array(
+ array(array()),
+ array(null),
+ array(''),
+ array(true),
+ array(new \stdClass()),
+ array(new \Datetime()),
+ );
+ }
+
+ public function validBankIdDataProvider()
+ {
+ return array(
+ array(Random::str(7, 12, '0123456789')),
+ array(Random::str(7, 12, '0123456789')),
+ );
+ }
+
+ public function invalidBankIdDataProvider()
+ {
+ return array(
+ array(array()),
+ array(null),
+ array(''),
+ array(true),
+ array(new \stdClass()),
+ array(new \Datetime()),
+ array(Random::str(13)),
+ );
+ }
+
+ public function validRecipientCheckedDataProvider()
+ {
+ return array(
+ array(Random::bool()),
+ array(Random::bool()),
+ );
+ }
+
+ public function invalidRecipientCheckedDataProvider()
+ {
+ return array(
+ array(array()),
+ array(null),
+ array(''),
+ array(new \stdClass()),
+ array(new \Datetime()),
+ );
+ }
+
+}
diff --git a/tests/Model/Payout/PayoutDestinationYooMoneyTest.php b/tests/Model/Payout/PayoutDestinationYooMoneyTest.php
index 341d4ab8..2897b12b 100644
--- a/tests/Model/Payout/PayoutDestinationYooMoneyTest.php
+++ b/tests/Model/Payout/PayoutDestinationYooMoneyTest.php
@@ -70,7 +70,6 @@ class PayoutDestinationYooMoneyTest extends AbstractPayoutDestinationTest
public function testSetInvalidAccountNumber($value)
{
$this->getTestInstance()->setAccountNumber($value);
-
}
/**
@@ -106,4 +105,4 @@ class PayoutDestinationYooMoneyTest extends AbstractPayoutDestinationTest
array(Random::str(1, 10, '0123456789')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Payout/PayoutSelfEmployedTest.php b/tests/Model/Payout/PayoutSelfEmployedTest.php
new file mode 100644
index 00000000..e56ff371
--- /dev/null
+++ b/tests/Model/Payout/PayoutSelfEmployedTest.php
@@ -0,0 +1,78 @@
+getTestInstance($options);
+ self::assertEquals($options['id'], $instance->getId());
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+
+ for ($i = 0; $i < 10; $i++) {
+ $deal = array(
+ 'id' => Random::str(SelfEmployedInterface::MIN_LENGTH_ID, SelfEmployedInterface::MAX_LENGTH_ID),
+ );
+ $result[] = array($deal);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new PayoutSelfEmployed();
+ $instance->setId($value);
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new PayoutSelfEmployed();
+ $instance->id = $value;
+ }
+
+ public function invalidIdDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(array()),
+ array(Random::str(1, 35)),
+ array(Random::str(51, 60)),
+ );
+ }
+}
diff --git a/tests/Model/PayoutTest.php b/tests/Model/PayoutTest.php
index 6d46a0a6..578df393 100644
--- a/tests/Model/PayoutTest.php
+++ b/tests/Model/PayoutTest.php
@@ -4,16 +4,18 @@ namespace Tests\YooKassa\Model;
use PHPUnit\Framework\TestCase;
use YooKassa\Helpers\Random;
+use YooKassa\Model\CurrencyCode;
use YooKassa\Model\Metadata;
use YooKassa\Model\MonetaryAmount;
use YooKassa\Model\PaymentMethodType;
use YooKassa\Model\Payout;
+use YooKassa\Model\Payout\IncomeReceipt;
use YooKassa\Model\Payout\PayoutCancellationDetails;
use YooKassa\Model\Payout\PayoutCancellationDetailsPartyCode;
use YooKassa\Model\Payout\PayoutCancellationDetailsReasonCode;
use YooKassa\Model\Deal\PayoutDealInfo;
use YooKassa\Model\Payout\PayoutDestinationFactory;
-use YooKassa\Model\Payout\PayoutDestinationYooMoney;
+use YooKassa\Model\Payout\PayoutSelfEmployed;
use YooKassa\Model\PayoutStatus;
class PayoutTest extends TestCase
@@ -127,28 +129,24 @@ class PayoutTest extends TestCase
/**
* @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
* @param $value
*/
public function testSetInvalidAmount($value)
{
- if (class_exists('InvalidPropertyValueTypeException')) {
- self::setExpectedException('InvalidPropertyValueTypeException');
- $instance = new Payout();
- $instance->setAmount($value['amount']);
- }
+ $instance = new Payout();
+ $instance->setAmount($value['amount']);
}
/**
* @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
* @param $value
*/
public function testSetterInvalidAmount($value)
{
- if (class_exists('InvalidPropertyValueTypeException')) {
- self::setExpectedException('InvalidPropertyValueTypeException');
- $instance = new Payout();
- $instance->amount = $value['amount'];
- }
+ $instance = new Payout();
+ $instance->amount = $value['amount'];
}
/**
@@ -194,6 +192,28 @@ class PayoutTest extends TestCase
$instance->payout_destination = $value['payout_destination'];
}
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidCancellationDetails($value)
+ {
+ $instance = new Payout();
+ $instance->setCancellationDetails($value['cancellation_details']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCancellationDetails($value)
+ {
+ $instance = new Payout();
+ $instance->payout_destination = $value['cancellation_details'];
+ }
+
/**
* @dataProvider validDataProvider
* @param array $options
@@ -310,13 +330,16 @@ class PayoutTest extends TestCase
self::assertNull($instance->getDeal());
self::assertNull($instance->deal);
- if (isset($options['deal'])) {
- $instance->setDeal($options['deal']);
- self::assertSame($options['deal'], $instance->getDeal());
- self::assertSame($options['deal'], $instance->deal);
- $instance = new Payout();
- $instance->deal = $options['deal'];
+ $instance->setDeal($options['deal']);
+
+ if (empty($options['deal'])) {
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->deal);
+ } elseif (is_array($options['deal'])) {
+ self::assertSame($options['deal'], $instance->getDeal()->toArray());
+ self::assertSame($options['deal'], $instance->deal->toArray());
+ } else {
self::assertSame($options['deal'], $instance->getDeal());
self::assertSame($options['deal'], $instance->deal);
}
@@ -344,6 +367,107 @@ class PayoutTest extends TestCase
$instance->deal = $value['deal'];
}
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetSelfEmployed($options)
+ {
+ $instance = new Payout();
+
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+
+ $instance->setSelfEmployed($options['self_employed']);
+
+ if (empty($options['receipt'])) {
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+ } elseif (is_array($options['self_employed'])) {
+ self::assertSame($options['self_employed'], $instance->getSelfEmployed()->toArray());
+ self::assertSame($options['self_employed'], $instance->self_employed->toArray());
+ self::assertSame($options['self_employed'], $instance->selfEmployed->toArray());
+ } else {
+ self::assertSame($options['self_employed'], $instance->getSelfEmployed());
+ self::assertSame($options['self_employed'], $instance->self_employed);
+ self::assertSame($options['self_employed'], $instance->selfEmployed);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidSelfEmployed($value)
+ {
+ $instance = new Payout();
+ $instance->setSelfEmployed($value['self_employed']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidSelfEmployed($value)
+ {
+ $instance = new Payout();
+ $instance->self_employed = $value['self_employed'];
+
+ $instance = new Payout();
+ $instance->selfEmployed = $value['self_employed'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetReceipt($options)
+ {
+ $instance = new Payout();
+
+ self::assertNull($instance->getReceipt());
+ self::assertNull($instance->receipt);
+
+ $instance->setReceipt($options['receipt']);
+
+ if (empty($options['receipt'])) {
+ self::assertNull($instance->getReceipt());
+ self::assertNull($instance->receipt);
+ } elseif (is_array($options['receipt'])) {
+ self::assertSame($options['receipt'], $instance->getReceipt()->toArray());
+ self::assertSame($options['receipt'], $instance->receipt->toArray());
+ } else {
+ self::assertSame($options['receipt'], $instance->getReceipt());
+ self::assertSame($options['receipt'], $instance->receipt);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidReceipt($value)
+ {
+ $instance = new Payout();
+ $instance->setReceipt($value['receipt']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidReceipt($value)
+ {
+ $instance = new Payout();
+ $instance->receipt = $value['receipt'];
+ }
+
/**
* @dataProvider validDataProvider
* @param $options
@@ -471,7 +595,9 @@ class PayoutTest extends TestCase
'payout_destination' => $payoutDestinations[Random::value(array(PaymentMethodType::YOO_MONEY,PaymentMethodType::BANK_CARD))],
'created_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
'test' => true,
- 'deal' => new PayoutDealInfo(array('id' => Random::str(36, 50))),
+ 'deal' => null,
+ 'self_employed' => null,
+ 'receipt' => array(),
'metadata' => array('order_id' => '37'),
'cancellation_details' => new PayoutCancellationDetails(array(
'party' => Random::value($cancellationDetailsParties),
@@ -485,9 +611,20 @@ class PayoutTest extends TestCase
'status' => Random::value(PayoutStatus::getValidValues()),
'amount' => new MonetaryAmount(Random::int(1, 10000), 'RUB'),
'description' => Random::str(1, Payout::MAX_LENGTH_DESCRIPTION),
- 'payout_destination' => $payoutDestinations[Random::value(array(PaymentMethodType::YOO_MONEY,PaymentMethodType::BANK_CARD))],
+ 'payout_destination' => null,
'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
'test' => true,
+ 'deal' => array('id' => Random::str(36, 50)),
+ 'receipt' => array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => Random::str(1, 50),
+ 'url' => Random::str(1, 50),
+ 'amount' => array(
+ 'value' => number_format(Random::float(1, 99), 2, '.', ''),
+ 'currency' => Random::value(CurrencyCode::getValidValues())
+ ),
+ ),
+ 'self_employed' => array('id' => Random::str(36, 50)),
'metadata' => null,
'cancellation_details' => null,
)
@@ -503,6 +640,17 @@ class PayoutTest extends TestCase
'payout_destination' => $payoutDestinations[Random::value(array(PaymentMethodType::YOO_MONEY,PaymentMethodType::BANK_CARD))],
'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
'test' => (bool)($i % 2),
+ 'deal' => new PayoutDealInfo(array('id' => Random::str(36, 50))),
+ 'self_employed' => new PayoutSelfEmployed(array('id' => Random::str(36, 50))),
+ 'receipt' => new IncomeReceipt(array(
+ 'service_name' => Random::str(1, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'npd_receipt_id' => Random::str(1, 50),
+ 'url' => Random::str(1, 50),
+ 'amount' => array(
+ 'value' => number_format(Random::float(1, 99), 2, '.', ''),
+ 'currency' => Random::value(CurrencyCode::getValidValues())
+ ),
+ )),
'metadata' => new Metadata(),
'cancellation_details' => new PayoutCancellationDetails(array(
'party' => $cancellationDetailsParties[$i % $countCancellationDetailsParties],
@@ -522,10 +670,14 @@ class PayoutTest extends TestCase
'id' => null,
'status' => null,
'amount' => null,
- 'payout_destination' => Random::str(10),
+ 'payout_destination' => time(),
'test' => null,
'deal' => time(),
+ 'self_employed' => time(),
+ 'receipt' => time(),
+ 'metadata' => time(),
'created_at' => null,
+ 'cancellation_details' => time(),
)
),
array(
@@ -536,6 +688,9 @@ class PayoutTest extends TestCase
'payout_destination' => new \stdClass(),
'test' => '',
'deal' => new Metadata(),
+ 'self_employed' => new \stdClass(),
+ 'receipt' => new Metadata(),
+ 'metadata' => new \stdClass(),
'created_at' => array(),
'cancellation_details' => new \stdClass(),
),
@@ -545,15 +700,18 @@ class PayoutTest extends TestCase
$payment = array(
'id' => Random::str($i < 5 ? mt_rand(1, 35) : mt_rand(51, 64)),
'status' => Random::str(1, 35),
- 'amount' => $i % 2 ? Random::str(10) : new \stdClass(),
+ 'amount' => $i % 2 ? array() : new \stdClass(),
'payout_destination' => $i % 2 ? Random::str(10) : new \stdClass(),
'test' => $i == 0 ? array() : new \stdClass(),
'deal' => $i == 0 ? Random::str(10) : new \stdClass(),
+ 'self_employed' => $i == 0 ? Random::str(10) : new \stdClass(),
+ 'receipt' => $i == 0 ? Random::str(10) : new \stdClass(),
+ 'metadata' => $i == 0 ? Random::str(10) : new \stdClass(),
+ 'cancellation_details' => $i == 0 ? Random::str(10) : new \stdClass(),
'created_at' => $i == 0 ? '23423-234-32' : -Random::int(),
);
$result[] = array($payment);
}
return $result;
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Model/PersonalData/PersonalDataCancellationDetailsTest.php b/tests/Model/PersonalData/PersonalDataCancellationDetailsTest.php
new file mode 100644
index 00000000..106f8fc7
--- /dev/null
+++ b/tests/Model/PersonalData/PersonalDataCancellationDetailsTest.php
@@ -0,0 +1,145 @@
+getParty());
+ self::assertEquals($value['reason'], $instance->getReason());
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $value
+ */
+ public function testGetSetParty($value = null)
+ {
+ $instance = self::getInstance($value);
+ self::assertEquals($value['party'], $instance->getParty());
+
+ $instance = self::getInstance();
+ $instance->setParty($value['party']);
+ self::assertEquals($value['party'], $instance->getParty());
+ self::assertEquals($value['party'], $instance->party);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param null $value
+ */
+ public function testGetSetReason($value = null)
+ {
+ $instance = self::getInstance($value);
+ self::assertEquals($value['reason'], $instance->getReason());
+
+ $instance = self::getInstance();
+ $instance->setReason($value['reason']);
+ self::assertEquals($value['reason'], $instance->getReason());
+ self::assertEquals($value['reason'], $instance->reason);
+ }
+
+ /**
+ * @dataProvider invalidValueDataProvider
+ * @param mixed $value
+ * @param string $exceptionClassName
+ */
+ public function testSetInvalidParty($value, $exceptionClassName)
+ {
+ $instance = self::getInstance();
+ try {
+ $instance->setParty($value);
+ } catch (\Exception $e) {
+ self::assertInstanceOf($exceptionClassName, $e);
+ }
+ }
+
+ /**
+ * @dataProvider invalidValueDataProvider
+ * @param mixed $value
+ * @param string $exceptionClassName
+ */
+ public function testSetterInvalidReason($value, $exceptionClassName)
+ {
+ $instance = self::getInstance();
+ try {
+ $instance->reason = $value;
+ } catch (\Exception $e) {
+ self::assertInstanceOf($exceptionClassName, $e);
+ }
+ }
+
+ /**
+ * @return array
+ */
+ public function validDataProvider()
+ {
+ $result = array();
+ $cancellationDetailsParties = PersonalDataCancellationDetailsPartyCode::getValidValues();
+ $countCancellationDetailsParties = count($cancellationDetailsParties);
+ $cancellationDetailsReasons = PersonalDataCancellationDetailsReasonCode::getValidValues();
+ $countCancellationDetailsReasons = count($cancellationDetailsReasons);
+ for ($i = 0; $i < 20; $i++) {
+ $result[] = array(
+ array(
+ 'party' => $cancellationDetailsParties[$i % $countCancellationDetailsParties],
+ 'reason' => $cancellationDetailsReasons[$i % $countCancellationDetailsReasons]
+ )
+ );
+ }
+ return $result;
+ }
+
+ public function invalidValueDataProvider()
+ {
+ $exceptionNamespace = 'YooKassa\\Common\\Exceptions\\';
+ return array(
+ array(null, $exceptionNamespace . 'EmptyPropertyValueException'),
+ array('', $exceptionNamespace . 'EmptyPropertyValueException'),
+ array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(true, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(false, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ );
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param null $value
+ */
+ public function testJsonSerialize($value = null)
+ {
+ $instance = new PersonalDataCancellationDetails($value);
+ $expected = array(
+ 'party' => $value['party'],
+ 'reason' => $value['reason'],
+ );
+ self::assertEquals($expected, $instance->jsonSerialize());
+ }
+}
diff --git a/tests/Model/PersonalData/PersonalDataTest.php b/tests/Model/PersonalData/PersonalDataTest.php
new file mode 100644
index 00000000..98f9a4dd
--- /dev/null
+++ b/tests/Model/PersonalData/PersonalDataTest.php
@@ -0,0 +1,455 @@
+getId());
+ self::assertNull($instance->id);
+
+ $instance->setId($options['id']);
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+
+ $instance = new PersonalData();
+ $instance->id = $options['id'];
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new PersonalData();
+ $instance->setId($value['id']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new PersonalData();
+ $instance->id = $value['id'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetStatus($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getStatus());
+ self::assertNull($instance->status);
+
+ $instance->setStatus($options['status']);
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+
+ $instance = new PersonalData();
+ $instance->status = $options['status'];
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidStatus($value)
+ {
+ $instance = new PersonalData();
+ $instance->setStatus($value['status']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidStatus($value)
+ {
+ $instance = new PersonalData();
+ $instance->status = $value['status'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetType($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getType());
+ self::assertNull($instance->type);
+
+ $instance->setType($options['type']);
+ self::assertSame($options['type'], $instance->getType());
+ self::assertSame($options['type'], $instance->type);
+
+ $instance = new PersonalData();
+ $instance->type = $options['type'];
+ self::assertSame($options['type'], $instance->getType());
+ self::assertSame($options['type'], $instance->type);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidType($value)
+ {
+ $instance = new PersonalData();
+ $instance->setType($value['type']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidType($value)
+ {
+ $instance = new PersonalData();
+ $instance->type = $value['type'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetCreatedAt($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getCreatedAt());
+ self::assertNull($instance->createdAt);
+ self::assertNull($instance->created_at);
+
+ $instance->setCreatedAt($options['created_at']);
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new PersonalData();
+ $instance->createdAt = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new PersonalData();
+ $instance->created_at = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidCreatedAt($value)
+ {
+ $instance = new PersonalData();
+ $instance->setCreatedAt($value['created_at']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreatedAt($value)
+ {
+ $instance = new PersonalData();
+ $instance->createdAt = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreated_at($value)
+ {
+ $instance = new PersonalData();
+ $instance->created_at = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetExpiresAt($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getExpiresAt());
+ self::assertNull($instance->expiresAt);
+ self::assertNull($instance->expires_at);
+
+ $instance->setExpiresAt($options['expires_at']);
+ if (!empty($options['expires_at'])) {
+ self::assertSame($options['expires_at'], $instance->getExpiresAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expiresAt->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expires_at->format(YOOKASSA_DATE));
+ }
+
+ $instance = new PersonalData();
+ $instance->expiresAt = $options['expires_at'];
+ if (!empty($options['expires_at'])) {
+ self::assertSame($options['expires_at'], $instance->getExpiresAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expiresAt->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expires_at->format(YOOKASSA_DATE));
+ }
+
+ $instance = new PersonalData();
+ $instance->expires_at = $options['expires_at'];
+ if (!empty($options['expires_at'])) {
+ self::assertSame($options['expires_at'], $instance->getExpiresAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expiresAt->format(YOOKASSA_DATE));
+ self::assertSame($options['expires_at'], $instance->expires_at->format(YOOKASSA_DATE));
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidExpiresAt($value)
+ {
+ $instance = new PersonalData();
+ $instance->setExpiresAt($value['expires_at']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidExpiresAt($value)
+ {
+ $instance = new PersonalData();
+ $instance->expiresAt = $value['expires_at'];
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidExpires_at($value)
+ {
+ $instance = new PersonalData();
+ $instance->expires_at = $value['expires_at'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetCancellationDetails($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getCancellationDetails());
+ self::assertNull($instance->cancellationDetails);
+ self::assertNull($instance->cancellation_details);
+
+ $instance->setCancellationDetails($options['cancellation_details']);
+ self::assertSame($options['cancellation_details'], $instance->getCancellationDetails());
+ self::assertSame($options['cancellation_details'], $instance->cancellationDetails);
+ self::assertSame($options['cancellation_details'], $instance->cancellation_details);
+
+ $instance = new PersonalData();
+ $instance->cancellationDetails = $options['cancellation_details'];
+ self::assertSame($options['cancellation_details'], $instance->getCancellationDetails());
+ self::assertSame($options['cancellation_details'], $instance->cancellationDetails);
+ self::assertSame($options['cancellation_details'], $instance->cancellation_details);
+
+ $instance = new PersonalData();
+ $instance->cancellation_details = $options['cancellation_details'];
+ self::assertSame($options['cancellation_details'], $instance->getCancellationDetails());
+ self::assertSame($options['cancellation_details'], $instance->cancellationDetails);
+ self::assertSame($options['cancellation_details'], $instance->cancellation_details);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCancellationDetails($value)
+ {
+ $instance = new PersonalData();
+ $instance->cancellation_details = $value['cancellation_details'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetMetadata($options)
+ {
+ $instance = new PersonalData();
+
+ self::assertNull($instance->getMetadata());
+ self::assertNull($instance->metadata);
+
+ if (is_array($options['metadata'])) {
+ $instance->setMetadata($options['metadata']);
+ self::assertSame($options['metadata'], $instance->getMetadata()->toArray());
+ self::assertSame($options['metadata'], $instance->metadata->toArray());
+
+ $instance = new PersonalData();
+ $instance->metadata = $options['metadata'];
+ self::assertSame($options['metadata'], $instance->getMetadata()->toArray());
+ self::assertSame($options['metadata'], $instance->metadata->toArray());
+ } elseif ($options['metadata'] instanceof Metadata || empty($options['metadata'])) {
+ $instance->setMetadata($options['metadata']);
+ self::assertSame($options['metadata'], $instance->getMetadata());
+ self::assertSame($options['metadata'], $instance->metadata);
+
+ $instance = new PersonalData();
+ $instance->metadata = $options['metadata'];
+ self::assertSame($options['metadata'], $instance->getMetadata());
+ self::assertSame($options['metadata'], $instance->metadata);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidMetadata($value)
+ {
+ $instance = new PersonalData();
+ $instance->metadata = $value['metadata'];
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+ $cancellationDetailsParties = PersonalDataCancellationDetailsPartyCode::getValidValues();
+ $countCancellationDetailsParties = count($cancellationDetailsParties);
+ $cancellationDetailsReasons = PersonalDataCancellationDetailsReasonCode::getValidValues();
+ $countCancellationDetailsReasons = count($cancellationDetailsReasons);
+
+
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
+ 'expires_at' => null,
+ 'metadata' => array('order_id' => '37'),
+ 'cancellation_details' => new PersonalDataCancellationDetails(array(
+ 'party' => Random::value($cancellationDetailsParties),
+ 'reason' => Random::value($cancellationDetailsReasons)
+ )),
+ )
+ );
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'expires_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'metadata' => null,
+ 'cancellation_details' => null,
+ )
+ );
+
+ for ($i = 0; $i < 20; $i++) {
+ $payment = array(
+ 'id' => Random::str(36, 50),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'expires_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'metadata' => new Metadata(),
+ 'cancellation_details' => new PersonalDataCancellationDetails(array(
+ 'party' => $cancellationDetailsParties[$i % $countCancellationDetailsParties],
+ 'reason' => $cancellationDetailsReasons[$i % $countCancellationDetailsReasons]
+ )),
+ );
+ $result[] = array($payment);
+ }
+ return $result;
+ }
+
+ public function invalidDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'id' => null,
+ 'type' => null,
+ 'status' => null,
+ 'created_at' => null,
+ 'expires_at' => '-',
+ 'cancellation_details' => 123,
+ 'metadata' => 789,
+ )
+ ),
+ array(
+ array(
+ 'id' => '',
+ 'type' => 'null',
+ 'status' => '',
+ 'created_at' => array(),
+ 'expires_at' => array(),
+ 'cancellation_details' => new \stdClass(),
+ 'metadata' => new \stdClass(),
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $personalData = array(
+ 'id' => Random::str($i < 5 ? mt_rand(1, 35) : mt_rand(51, 64)),
+ 'type' => $i % 2 ? Random::str(10) : new \stdClass(),
+ 'status' => Random::str(1, 35),
+ 'created_at' => $i === 0 ? '23423-234-32' : -Random::int(),
+ 'expires_at' => $i === 0 ? '23423-234-32' : -Random::int(),
+ 'cancellation_details' => 'null',
+ 'metadata' => 'null',
+ );
+ $result[] = array($personalData);
+ }
+ return $result;
+ }
+}
diff --git a/tests/Model/Receipt/AdditionalUserPropsTest.php b/tests/Model/Receipt/AdditionalUserPropsTest.php
index aeca5547..8a3dfc50 100644
--- a/tests/Model/Receipt/AdditionalUserPropsTest.php
+++ b/tests/Model/Receipt/AdditionalUserPropsTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class AdditionalUserPropsTest extends TestCase
{
-
protected static function getInstance($options = null)
{
return new AdditionalUserProps($options);
diff --git a/tests/Model/Receipt/IndustryDetailsTest.php b/tests/Model/Receipt/IndustryDetailsTest.php
index 98fce022..9db4337c 100644
--- a/tests/Model/Receipt/IndustryDetailsTest.php
+++ b/tests/Model/Receipt/IndustryDetailsTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class IndustryDetailsTest extends TestCase
{
-
protected static function getInstance($options = null)
{
return new IndustryDetails($options);
diff --git a/tests/Model/Receipt/MarkCodeInfoTest.php b/tests/Model/Receipt/MarkCodeInfoTest.php
index c84aaac3..62c02a92 100644
--- a/tests/Model/Receipt/MarkCodeInfoTest.php
+++ b/tests/Model/Receipt/MarkCodeInfoTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class MarkCodeInfoTest extends TestCase
{
-
protected static function getInstance($options = null)
{
return new MarkCodeInfo($options);
@@ -163,7 +162,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_UNKNOWN_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_UNKNOWN_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -234,7 +233,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_EAN_8_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_EAN_8_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -305,7 +304,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_EAN_13_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_EAN_13_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -376,7 +375,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_ITF_14_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_ITF_14_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -447,7 +446,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_GS_10_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_GS_10_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -518,7 +517,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_GS_1M_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_GS_1M_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -589,7 +588,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_SHORT_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_SHORT_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -660,7 +659,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_FUR_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_FUR_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -731,7 +730,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_EGAIS_20_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_EGAIS_20_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
@@ -802,7 +801,7 @@ class MarkCodeInfoTest extends TestCase
array('', $exceptionNamespace . 'EmptyPropertyValueException'),
array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
- array(Random::str( MarkCodeInfo::MAX_EGAIS_30_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
+ array(Random::str(MarkCodeInfo::MAX_EGAIS_30_LENGTH + 1), $exceptionNamespace . 'InvalidPropertyValueException'),
array(-1, $exceptionNamespace . 'InvalidPropertyValueException'),
array(-0.01, $exceptionNamespace . 'InvalidPropertyValueException'),
array(0.0, $exceptionNamespace . 'InvalidPropertyValueException'),
diff --git a/tests/Model/Receipt/MarkQuantityTest.php b/tests/Model/Receipt/MarkQuantityTest.php
index 24c69606..7f97a8cf 100644
--- a/tests/Model/Receipt/MarkQuantityTest.php
+++ b/tests/Model/Receipt/MarkQuantityTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class MarkQuantityTest extends TestCase
{
-
protected static function getInstance($options = null)
{
return new MarkQuantity($options);
diff --git a/tests/Model/Receipt/OperationalDetailsTest.php b/tests/Model/Receipt/OperationalDetailsTest.php
index 51b67add..a7f83641 100644
--- a/tests/Model/Receipt/OperationalDetailsTest.php
+++ b/tests/Model/Receipt/OperationalDetailsTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class OperationalDetailsTest extends TestCase
{
-
protected static function getInstance($options = null)
{
return new OperationalDetails($options);
diff --git a/tests/Model/ReceiptCustomerTest.php b/tests/Model/ReceiptCustomerTest.php
index 107b9ac5..8c240eb7 100644
--- a/tests/Model/ReceiptCustomerTest.php
+++ b/tests/Model/ReceiptCustomerTest.php
@@ -506,4 +506,4 @@ class ReceiptCustomerTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ReceiptItemTest.php b/tests/Model/ReceiptItemTest.php
index 0b72997a..7c56462f 100644
--- a/tests/Model/ReceiptItemTest.php
+++ b/tests/Model/ReceiptItemTest.php
@@ -515,6 +515,92 @@ class ReceiptItemTest extends TestCase
);
}
+ /**
+ * @dataProvider invalidPaymentModeDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetInvalidPaymentMode($value)
+ {
+ $this->getTestInstance()->setPaymentMode($value);
+ }
+
+ /**
+ * @dataProvider invalidPaymentModeDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetterInvalidPaymentMode($value)
+ {
+ $this->getTestInstance()->paymentMode = $value;
+ }
+
+ /**
+ * @dataProvider invalidPaymentModeDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetterInvalidPayment_mode($value)
+ {
+ $this->getTestInstance()->payment_mode = $value;
+ }
+
+ public function invalidPaymentModeDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(array()),
+ array(new \stdClass()),
+ );
+ }
+
+ /**
+ * @dataProvider invalidPaymentSubjectDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetInvalidPaymentSubject($value)
+ {
+ $this->getTestInstance()->setPaymentSubject($value);
+ }
+
+ /**
+ * @dataProvider invalidPaymentSubjectDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetterInvalidPaymentSubject($value)
+ {
+ $this->getTestInstance()->paymentSubject = $value;
+ }
+
+ /**
+ * @dataProvider invalidPaymentSubjectDataProvider
+ * @expectedException \InvalidArgumentException
+ *
+ * @param $value
+ */
+ public function testSetterInvalidPayment_subject($value)
+ {
+ $this->getTestInstance()->payment_subject = $value;
+ }
+
+ public function invalidPaymentSubjectDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(array()),
+ array(new \stdClass()),
+ );
+ }
+
/**
* @dataProvider invalidVatCodeDataProvider
* @expectedException \InvalidArgumentException
@@ -928,7 +1014,6 @@ class ReceiptItemTest extends TestCase
$instance->setPrice(new ReceiptItemAmount(Random::int(1, 100)));
$instance->setQuantity($quantity);
$instance->fetchItem($fetch);
-
}
public function invalidFetchItemDataProvider()
diff --git a/tests/Model/ReceiptTest.php b/tests/Model/ReceiptTest.php
index 94194c41..9b7373e2 100644
--- a/tests/Model/ReceiptTest.php
+++ b/tests/Model/ReceiptTest.php
@@ -19,7 +19,7 @@ class ReceiptTest extends TestCase
public function testGetSetAddItems()
{
$instance = new Receipt();
-
+
self::assertNotNull($instance->getItems());
self::assertTrue(is_array($instance->getItems()));
self::assertEmpty($instance->getItems());
@@ -27,7 +27,7 @@ class ReceiptTest extends TestCase
self::assertNotNull($instance->items);
self::assertTrue(is_array($instance->items));
self::assertEmpty($instance->items);
-
+
$item = new ReceiptItem();
$instance->addItem($item);
$items = $instance->getItems();
@@ -844,4 +844,4 @@ class ReceiptTest extends TestCase
)
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/RecipientTest.php b/tests/Model/RecipientTest.php
index 9848765f..1be779c7 100644
--- a/tests/Model/RecipientTest.php
+++ b/tests/Model/RecipientTest.php
@@ -158,4 +158,4 @@ class RecipientTest extends TestCase
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/RefundTest.php b/tests/Model/RefundTest.php
index 69377589..59242ba0 100644
--- a/tests/Model/RefundTest.php
+++ b/tests/Model/RefundTest.php
@@ -83,10 +83,10 @@ class RefundTest extends TestCase
array(''),
array(null),
array(array()),
- array(Random::str(1,35)),
+ array(Random::str(1, 35)),
array(Random::str(1)),
array(Random::str(35)),
- array(Random::str(37,48)),
+ array(Random::str(37, 48)),
array(Random::str(37)),
array(new \stdClass()),
array(1),
@@ -129,7 +129,7 @@ class RefundTest extends TestCase
public function validSources()
{
$sources = array();
- for($i = 0; $i < 10; $i++) {
+ for ($i = 0; $i < 10; $i++) {
$sources[$i][] = array(
'account_id' => (string)Random::int(11111111, 99999999),
'amount' => array(
@@ -539,8 +539,8 @@ class RefundTest extends TestCase
array(false),
array(array()),
array(new \stdClass()),
- array(Random::str(1,10)),
- array(new StringObject(Random::str(1,10))),
+ array(Random::str(1, 10)),
+ array(new StringObject(Random::str(1, 10))),
);
}
@@ -649,10 +649,12 @@ class RefundTest extends TestCase
/**
* @return array
+ * @throws \Exception
*/
public function validDealDataProvider()
{
return array(
+ array(null),
array(new RefundDealInfo(array('amount' => 1))),
array(new RefundDealInfo(array('amount' => Random::float(0.01, 9999999.99)))),
);
@@ -693,5 +695,4 @@ class RefundTest extends TestCase
array(new \stdClass()),
);
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Model/SafeDealTest.php b/tests/Model/SafeDealTest.php
index 15d3c5d5..f3be116b 100644
--- a/tests/Model/SafeDealTest.php
+++ b/tests/Model/SafeDealTest.php
@@ -13,7 +13,6 @@ use YooKassa\Model\SafeDeal;
class SafeDealTest extends TestCase
{
-
/**
* @dataProvider validDataProvider
* @param array $options
diff --git a/tests/Model/SelfEmployed/AbstractConfirmationTest.php b/tests/Model/SelfEmployed/AbstractConfirmationTest.php
new file mode 100644
index 00000000..f15bd33f
--- /dev/null
+++ b/tests/Model/SelfEmployed/AbstractConfirmationTest.php
@@ -0,0 +1,63 @@
+getTestInstance();
+ self::assertEquals($this->getExpectedType(), $instance->getType());
+ }
+
+ /**
+ * @dataProvider invalidTypeDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testInvalidType($value)
+ {
+ new TestConfirmation($value);
+ }
+
+ /**
+ * @return array
+ * @throws \Exception
+ */
+ public function invalidTypeDataProvider()
+ {
+ return array(
+ array(''),
+ array(null),
+ array(Random::str(40)),
+ array(0),
+ array(array()),
+ array(new \stdClass()),
+ );
+ }
+}
+
+class TestConfirmation extends SelfEmployedConfirmation
+{
+ public function __construct($type)
+ {
+ $this->setType($type);
+ }
+}
diff --git a/tests/Model/SelfEmployed/ConfirmationFactoryTest.php b/tests/Model/SelfEmployed/ConfirmationFactoryTest.php
new file mode 100644
index 00000000..818cf859
--- /dev/null
+++ b/tests/Model/SelfEmployed/ConfirmationFactoryTest.php
@@ -0,0 +1,157 @@
+getTestInstance();
+ $confirmation = $instance->factory($type);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedConfirmation);
+ self::assertEquals($type, $confirmation->getType());
+ }
+
+ /**
+ * @dataProvider invalidTypeDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $type
+ */
+ public function testInvalidFactory($type)
+ {
+ $instance = $this->getTestInstance();
+ $instance->factory($type);
+ }
+
+ /**
+ * @dataProvider validArrayDataProvider
+ * @param array $options
+ */
+ public function testFactoryFromArray($options)
+ {
+ $instance = $this->getTestInstance();
+ $confirmation = $instance->factoryFromArray($options);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedConfirmation);
+
+ foreach ($options as $property => $value) {
+ self::assertEquals($confirmation->{$property}, $value);
+ }
+
+ $type = $options['type'];
+ unset($options['type']);
+ $confirmation = $instance->factoryFromArray($options, $type);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedConfirmation);
+
+ self::assertEquals($type, $confirmation->getType());
+ foreach ($options as $property => $value) {
+ self::assertEquals($confirmation->{$property}, $value);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataArrayDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $options
+ */
+ public function testInvalidFactoryFromArray($options)
+ {
+ $instance = $this->getTestInstance();
+ $instance->factoryFromArray($options);
+ }
+
+ public function validTypeDataProvider()
+ {
+ $result = array();
+ foreach (SelfEmployedConfirmationType::getValidValues() as $value) {
+ $result[] = array($value);
+ }
+ return $result;
+ }
+
+ public function invalidTypeDataProvider()
+ {
+ return array(
+ array(''),
+ array(null),
+ array(0),
+ array(1),
+ array(-1),
+ array('5'),
+ array(array()),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+
+ public function validArrayDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ 'confirmationUrl' => Random::str(10),
+ ),
+ ),
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ 'confirmationUrl' => Random::str(10),
+ ),
+ ),
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ 'confirmationUrl' => Random::str(10),
+ ),
+ ),
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ ),
+ ),
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ ),
+ ),
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ ),
+ ),
+ );
+ foreach (SelfEmployedConfirmationType::getValidValues() as $value) {
+ $result[] = array(array('type' => $value));
+ }
+ return $result;
+ }
+
+ public function invalidDataArrayDataProvider()
+ {
+ return array(
+ array(array()),
+ array(array('type' => 'test')),
+ );
+ }
+}
diff --git a/tests/Model/SelfEmployed/ConfirmationRedirectTest.php b/tests/Model/SelfEmployed/ConfirmationRedirectTest.php
new file mode 100644
index 00000000..32c18a67
--- /dev/null
+++ b/tests/Model/SelfEmployed/ConfirmationRedirectTest.php
@@ -0,0 +1,141 @@
+getTestInstance();
+
+ self::assertNull($instance->getConfirmationUrl());
+ self::assertNull($instance->confirmationUrl);
+ self::assertNull($instance->confirmation_url);
+
+ $instance->setConfirmationUrl($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getConfirmationUrl());
+ self::assertNull($instance->confirmationUrl);
+ self::assertNull($instance->confirmation_url);
+ } else {
+ self::assertEquals($value, $instance->getConfirmationUrl());
+ self::assertEquals($value, $instance->confirmationUrl);
+ self::assertEquals($value, $instance->confirmation_url);
+ }
+
+ $instance->setConfirmationUrl(null);
+ self::assertNull($instance->getConfirmationUrl());
+ self::assertNull($instance->confirmationUrl);
+ self::assertNull($instance->confirmation_url);
+
+ $instance->confirmationUrl = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getConfirmationUrl());
+ self::assertNull($instance->confirmationUrl);
+ self::assertNull($instance->confirmation_url);
+ } else {
+ self::assertEquals($value, $instance->getConfirmationUrl());
+ self::assertEquals($value, $instance->confirmationUrl);
+ self::assertEquals($value, $instance->confirmation_url);
+ }
+
+ $instance->confirmation_url = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getConfirmationUrl());
+ self::assertNull($instance->confirmationUrl);
+ self::assertNull($instance->confirmation_url);
+ } else {
+ self::assertEquals($value, $instance->getConfirmationUrl());
+ self::assertEquals($value, $instance->confirmationUrl);
+ self::assertEquals($value, $instance->confirmation_url);
+ }
+ }
+
+ /**
+ * @dataProvider invalidUrlDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidConfirmationUrl($value)
+ {
+ $instance = $this->getTestInstance();
+ $instance->setConfirmationUrl($value);
+ }
+
+ /**
+ * @dataProvider invalidUrlDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidConfirmationUrl($value)
+ {
+ $instance = $this->getTestInstance();
+ $instance->confirmationUrl = $value;
+ }
+
+ /**
+ * @dataProvider invalidUrlDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidConfirmation_url($value)
+ {
+ $instance = $this->getTestInstance();
+ $instance->confirmation_url = $value;
+ }
+
+ public function validEnforceDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(null),
+ array(''),
+ array(0),
+ array(1),
+ array(100),
+ );
+ }
+
+ public function validUrlDataProvider()
+ {
+ return array(
+ array('https://test.ru'),
+ array(null),
+ array(''),
+ );
+ }
+
+ public function invalidUrlDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(array()),
+ array(new \stdClass()),
+ );
+ }
+}
diff --git a/tests/Model/SelfEmployed/SelfEmployedTest.php b/tests/Model/SelfEmployed/SelfEmployedTest.php
new file mode 100644
index 00000000..8a11edeb
--- /dev/null
+++ b/tests/Model/SelfEmployed/SelfEmployedTest.php
@@ -0,0 +1,424 @@
+getId());
+ self::assertNull($instance->id);
+
+ $instance->setId($options['id']);
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+
+ $instance = new SelfEmployed();
+ $instance->id = $options['id'];
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setId($value['id']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->id = $value['id'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetStatus($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getStatus());
+ self::assertNull($instance->status);
+
+ $instance->setStatus($options['status']);
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+
+ $instance = new SelfEmployed();
+ $instance->status = $options['status'];
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidStatus($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setStatus($value['status']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidStatus($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->status = $value['status'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetTest($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getTest());
+ self::assertNull($instance->test);
+
+ $instance->setTest($options['test']);
+ self::assertSame($options['test'], $instance->getTest());
+ self::assertSame($options['test'], $instance->test);
+
+ $instance = new SelfEmployed();
+ $instance->test = $options['test'];
+ self::assertSame($options['test'], $instance->getTest());
+ self::assertSame($options['test'], $instance->test);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidTest($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setTest($value['test']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidTest($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->test = $value['test'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetPhone($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $instance->setPhone($options['phone']);
+ self::assertSame($options['phone'], $instance->getPhone());
+ self::assertSame($options['phone'], $instance->phone);
+
+ $instance = new SelfEmployed();
+ $instance->phone = $options['phone'];
+ self::assertSame($options['phone'], $instance->getPhone());
+ self::assertSame($options['phone'], $instance->phone);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidPhone($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setPhone($value['phone']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidPhone($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->phone = $value['phone'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetItn($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getItn());
+ self::assertNull($instance->itn);
+
+ $instance->setItn($options['itn']);
+ self::assertSame($options['itn'], $instance->getItn());
+ self::assertSame($options['itn'], $instance->itn);
+
+ $instance = new SelfEmployed();
+ $instance->itn = $options['itn'];
+ self::assertSame($options['itn'], $instance->getItn());
+ self::assertSame($options['itn'], $instance->itn);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidItn($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setItn($value['itn']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidItn($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->itn = $value['itn'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetCreatedAt($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getCreatedAt());
+ self::assertNull($instance->createdAt);
+ self::assertNull($instance->created_at);
+
+ $instance->setCreatedAt($options['created_at']);
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new SelfEmployed();
+ $instance->createdAt = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new SelfEmployed();
+ $instance->created_at = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidCreatedAt($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->setCreatedAt($value['created_at']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreatedAt($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->createdAt = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreated_at($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->created_at = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetConfirmation($options)
+ {
+ $instance = new SelfEmployed();
+
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+
+ $instance->setConfirmation($options['confirmation']);
+ if (is_array($options['confirmation'])) {
+ self::assertSame($options['confirmation'], $instance->getConfirmation()->toArray());
+ self::assertSame($options['confirmation'], $instance->confirmation->toArray());
+ } else {
+ self::assertSame($options['confirmation'], $instance->getConfirmation());
+ self::assertSame($options['confirmation'], $instance->confirmation);
+ }
+
+ $instance = new SelfEmployed();
+ $instance->confirmation = $options['confirmation'];
+ if (is_array($options['confirmation'])) {
+ self::assertSame($options['confirmation'], $instance->getConfirmation()->toArray());
+ self::assertSame($options['confirmation'], $instance->confirmation->toArray());
+ } else {
+ self::assertSame($options['confirmation'], $instance->getConfirmation());
+ self::assertSame($options['confirmation'], $instance->confirmation);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidConfirmation($value)
+ {
+ $instance = new SelfEmployed();
+ $instance->confirmation = $value['confirmation'];
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+ $confirmTypes = SelfEmployedConfirmationType::getValidValues();
+ $confirmFactory = new SelfEmployedConfirmationFactory();
+
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => null,
+ 'phone' => Random::str(11, 11,'0123456789'),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
+ 'confirmation' => array('type' => Random::value($confirmTypes)),
+ )
+ );
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => Random::str(11, 11,'0123456789'),
+ 'phone' => null,
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'confirmation' => null,
+ )
+ );
+
+ for ($i = 0; $i < 20; $i++) {
+ $payment = array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => Random::str(11, 11,'0123456789'),
+ 'phone' => Random::str(11, 11,'0123456789'),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'confirmation' => $confirmFactory->factory(Random::value($confirmTypes)),
+ );
+ $result[] = array($payment);
+ }
+ return $result;
+ }
+
+ public function invalidDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'id' => null,
+ 'test' => null,
+ 'status' => null,
+ 'itn' => new \stdClass(),
+ 'phone' => array(),
+ 'created_at' => null,
+ 'confirmation' => array('type' => null),
+ )
+ ),
+ array(
+ array(
+ 'id' => '',
+ 'test' => 'null',
+ 'status' => '',
+ 'itn' => array(),
+ 'phone' => new \stdClass(),
+ 'created_at' => array(),
+ 'confirmation' => new \stdClass(),
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $selfEmployed = array(
+ 'id' => Random::str($i < 5 ? mt_rand(1, 35) : mt_rand(51, 64)),
+ 'test' => $i % 2 ? Random::str(10) : new \stdClass(),
+ 'status' => Random::str(1, 35),
+ 'phone' => $i % 2 ? new \stdClass() : array(),
+ 'itn' => $i % 2 ? new \stdClass() : array(),
+ 'created_at' => $i === 0 ? '23423-234-32' : -Random::int(),
+ 'confirmation' => Random::value(array(
+ array('type' => null),
+ array('type' => true),
+ array('type' => new \stdClass()),
+ array('type' => array()),
+ array('type' => 'fake'),
+ )),
+ );
+ $result[] = array($selfEmployed);
+ }
+ return $result;
+ }
+}
diff --git a/tests/Model/SettlementTest.php b/tests/Model/SettlementTest.php
index e7ad5315..69fc13df 100644
--- a/tests/Model/SettlementTest.php
+++ b/tests/Model/SettlementTest.php
@@ -191,5 +191,4 @@ class SettlementTest extends TestCase
return $result;
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Model/SourceTest.php b/tests/Model/SourceTest.php
index e5568ff0..f8861688 100644
--- a/tests/Model/SourceTest.php
+++ b/tests/Model/SourceTest.php
@@ -280,4 +280,4 @@ class SourceTest extends TestCase
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/ThreeDSecureTest.php b/tests/Model/ThreeDSecureTest.php
index a49d9104..e4acb9dd 100644
--- a/tests/Model/ThreeDSecureTest.php
+++ b/tests/Model/ThreeDSecureTest.php
@@ -2,9 +2,10 @@
namespace Tests\YooKassa\Model;
+use PHPUnit\Framework\TestCase;
use YooKassa\Model\ThreeDSecure;
-class ThreeDSecureTest extends \PHPUnit_Framework_TestCase
+class ThreeDSecureTest extends TestCase
{
/**
* @dataProvider validDataProvider
@@ -77,13 +78,13 @@ class ThreeDSecureTest extends \PHPUnit_Framework_TestCase
{
$exceptionNamespace = 'YooKassa\\Common\\Exceptions\\';
return array(
- array(array(), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(fopen(__FILE__, 'r'), $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(-1, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(-0.01, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array(0.0, $exceptionNamespace.'InvalidPropertyValueTypeException'),
- array('', $exceptionNamespace.'EmptyPropertyValueException'),
- array(null, $exceptionNamespace.'EmptyPropertyValueException'),
+ array(array(), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(fopen(__FILE__, 'r'), $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(-1, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(-0.01, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array(0.0, $exceptionNamespace . 'InvalidPropertyValueTypeException'),
+ array('', $exceptionNamespace . 'EmptyPropertyValueException'),
+ array(null, $exceptionNamespace . 'EmptyPropertyValueException'),
);
}
@@ -95,7 +96,7 @@ class ThreeDSecureTest extends \PHPUnit_Framework_TestCase
*/
public function testJsonSerialize($threeDSecure)
{
- if (is_object($threeDSecure)){
+ if (is_object($threeDSecure)) {
$threeDSecure = $threeDSecure->jsonSerialize();
}
diff --git a/tests/Model/TransferTest.php b/tests/Model/TransferTest.php
index aa87e1c6..1b435b90 100644
--- a/tests/Model/TransferTest.php
+++ b/tests/Model/TransferTest.php
@@ -436,4 +436,4 @@ class TransferTest extends TestCase
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Model/Webhook/WebhookTest.php b/tests/Model/Webhook/WebhookTest.php
index 67188554..9aacb905 100644
--- a/tests/Model/Webhook/WebhookTest.php
+++ b/tests/Model/Webhook/WebhookTest.php
@@ -33,7 +33,7 @@ class WebhookTest extends TestCase
public function testWebhookConstructorInstantiate($data)
{
$webhook = new Webhook($data);
-
+
self::assertEquals($webhook->getId(), $data['id']);
self::assertEquals($webhook->getUrl(), $data['url']);
self::assertEquals($webhook->getEvent(), $data['event']);
@@ -68,4 +68,4 @@ class WebhookTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/CreateDealRequestBuilderTest.php b/tests/Request/Deals/CreateDealRequestBuilderTest.php
index 48fc668d..08ff593a 100644
--- a/tests/Request/Deals/CreateDealRequestBuilderTest.php
+++ b/tests/Request/Deals/CreateDealRequestBuilderTest.php
@@ -223,5 +223,4 @@ class CreateDealRequestBuilderTest extends TestCase
array(new SafeDeal()),
);
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/CreateDealRequestSerializerTest.php b/tests/Request/Deals/CreateDealRequestSerializerTest.php
index 801081ae..b7294953 100644
--- a/tests/Request/Deals/CreateDealRequestSerializerTest.php
+++ b/tests/Request/Deals/CreateDealRequestSerializerTest.php
@@ -11,7 +11,6 @@ use YooKassa\Request\Deals\CreateDealRequestSerializer;
class CreateDealRequestSerializerTest extends TestCase
{
-
/**
* @dataProvider validDataProvider
*
diff --git a/tests/Request/Deals/CreateDealRequestTest.php b/tests/Request/Deals/CreateDealRequestTest.php
index 2831ce76..c8ef9741 100644
--- a/tests/Request/Deals/CreateDealRequestTest.php
+++ b/tests/Request/Deals/CreateDealRequestTest.php
@@ -12,7 +12,6 @@ use YooKassa\Request\Deals\CreateDealRequestBuilder;
class CreateDealRequestTest extends TestCase
{
-
/**
* @dataProvider validDataProvider
* @param $options
@@ -225,5 +224,4 @@ class CreateDealRequestTest extends TestCase
array(Random::str(10)),
);
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/DealResponseTest.php b/tests/Request/Deals/DealResponseTest.php
index 5b541ee4..df5b6b61 100644
--- a/tests/Request/Deals/DealResponseTest.php
+++ b/tests/Request/Deals/DealResponseTest.php
@@ -10,4 +10,4 @@ class DealResponseTest extends AbstractDealResponseTest
{
return new DealResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/DealsRequestBuilderTest.php b/tests/Request/Deals/DealsRequestBuilderTest.php
index 9361878e..e1f9f81a 100644
--- a/tests/Request/Deals/DealsRequestBuilderTest.php
+++ b/tests/Request/Deals/DealsRequestBuilderTest.php
@@ -329,4 +329,4 @@ class DealsRequestBuilderTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/DealsRequestSerializerTest.php b/tests/Request/Deals/DealsRequestSerializerTest.php
index ad675511..94d67e82 100644
--- a/tests/Request/Deals/DealsRequestSerializerTest.php
+++ b/tests/Request/Deals/DealsRequestSerializerTest.php
@@ -107,4 +107,4 @@ class DealsRequestSerializerTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/DealsRequestTest.php b/tests/Request/Deals/DealsRequestTest.php
index e536f89f..b2520be7 100644
--- a/tests/Request/Deals/DealsRequestTest.php
+++ b/tests/Request/Deals/DealsRequestTest.php
@@ -345,9 +345,9 @@ class DealsRequestTest extends TestCase
private function getterAndSetterTest($value, $property, $expected, $testHas = true)
{
- $getter = 'get'.ucfirst($property);
- $setter = 'set'.ucfirst($property);
- $has = 'has'.ucfirst($property);
+ $getter = 'get' . ucfirst($property);
+ $setter = 'set' . ucfirst($property);
+ $has = 'has' . ucfirst($property);
$instance = $this->getTestInstance();
@@ -404,4 +404,4 @@ class DealsRequestTest extends TestCase
}
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Deals/DealsResponseTest.php b/tests/Request/Deals/DealsResponseTest.php
index d6d48f43..2ff3ad25 100644
--- a/tests/Request/Deals/DealsResponseTest.php
+++ b/tests/Request/Deals/DealsResponseTest.php
@@ -251,4 +251,4 @@ class DealsResponseTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/AbstractPaymentResponseTest.php b/tests/Request/Payments/AbstractPaymentResponseTest.php
index e9eb4c2b..9fcf47c9 100644
--- a/tests/Request/Payments/AbstractPaymentResponseTest.php
+++ b/tests/Request/Payments/AbstractPaymentResponseTest.php
@@ -513,5 +513,4 @@ abstract class AbstractPaymentResponseTest extends TestCase
);
}
}
-
}
diff --git a/tests/Request/Payments/CreatePaymentRequestBuilderTest.php b/tests/Request/Payments/CreatePaymentRequestBuilderTest.php
index 47b350b7..b4cb9edb 100644
--- a/tests/Request/Payments/CreatePaymentRequestBuilderTest.php
+++ b/tests/Request/Payments/CreatePaymentRequestBuilderTest.php
@@ -13,6 +13,7 @@ use YooKassa\Model\CurrencyCode;
use YooKassa\Model\Deal\PaymentDealInfo;
use YooKassa\Model\Deal\SettlementPayoutPayment;
use YooKassa\Model\Deal\SettlementPayoutPaymentType;
+use YooKassa\Model\FraudData;
use YooKassa\Model\MonetaryAmount;
use YooKassa\Model\Payment;
use YooKassa\Model\PaymentData\PaymentDataQiwi;
@@ -104,6 +105,31 @@ class CreatePaymentRequestBuilderTest extends TestCase
}
}
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetFraudData($options)
+ {
+ $builder = new CreatePaymentRequestBuilder();
+ $builder->setAmount($options['amount']);
+ $builder->setFraudData($options['fraud_data']);
+ $instance = $builder->build();
+
+ if (empty($options['fraud_data'])) {
+ self::assertNull($instance->getFraudData());
+ } else {
+ self::assertNotNull($instance->getFraudData());
+ if (is_array($options['fraud_data'])) {
+ self::assertEquals($options['fraud_data'], $instance->getFraudData()->toArray());
+ } else {
+ self::assertEquals($options['fraud_data'], $instance->getFraudData());
+ }
+ }
+ }
+
/**
* @dataProvider validDataProvider
*
@@ -243,12 +269,22 @@ class CreatePaymentRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptItem(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getQuantity(), $item->getVatCode(),
- $item->getPaymentMode(), $item->getPaymentSubject()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getQuantity(),
+ $item->getVatCode(),
+ $item->getPaymentMode(),
+ $item->getPaymentSubject()
);
} else {
- $builder->addReceiptItem($item['title'], $item['price'], $item['quantity'], $item['vatCode'],
- $item['paymentMode'], $item['paymentSubject']);
+ $builder->addReceiptItem(
+ $item['title'],
+ $item['price'],
+ $item['quantity'],
+ $item['vatCode'],
+ $item['paymentMode'],
+ $item['paymentSubject']
+ );
}
}
$builder->setReceiptEmail($options['receiptEmail']);
@@ -278,7 +314,9 @@ class CreatePaymentRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptShipping(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getVatCode()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getVatCode()
);
} else {
$builder->addReceiptShipping($item['title'], $item['price'], $item['vatCode']);
@@ -939,6 +977,7 @@ class CreatePaymentRequestBuilderTest extends TestCase
)
)
),
+ 'fraud_data' => null,
'receiptIndustryDetails' => null,
'receiptOperationalDetails' => null,
),
@@ -978,6 +1017,9 @@ class CreatePaymentRequestBuilderTest extends TestCase
'id' => Random::str(36, 50),
'settlements' => array(),
),
+ 'fraud_data' => new FraudData(array(
+ 'id' => Random::str(11, 15, '0123456789'),
+ )),
'receiptIndustryDetails' => '',
'receiptOperationalDetails' => '',
),
@@ -1048,6 +1090,9 @@ class CreatePaymentRequestBuilderTest extends TestCase
)
)
),
+ 'fraud_data' => array(
+ 'id' => Random::str(11, 15, '0123456789'),
+ ),
);
$result[] = array($request);
}
@@ -1223,4 +1268,32 @@ class CreatePaymentRequestBuilderTest extends TestCase
$builder = new CreatePaymentRequestBuilder();
$builder->setDeal($value);
}
+
+ /**
+ * @return array
+ * @throws Exception
+ */
+ public function invalidFraudDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(new \stdClass()),
+ array(0),
+ array(7),
+ array(Random::int(-100, -1)),
+ array(Random::int(7, 100)),
+ );
+ }
+
+ /**
+ * @dataProvider invalidFraudDataProvider
+ * @expectedException InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidFraudData($value)
+ {
+ $builder = new CreatePaymentRequestBuilder();
+ $builder->setFraudData($value);
+ }
}
diff --git a/tests/Request/Payments/CreatePaymentRequestSerializerTest.php b/tests/Request/Payments/CreatePaymentRequestSerializerTest.php
index 87945fc3..faa5c700 100644
--- a/tests/Request/Payments/CreatePaymentRequestSerializerTest.php
+++ b/tests/Request/Payments/CreatePaymentRequestSerializerTest.php
@@ -422,4 +422,4 @@ class CreatePaymentRequestSerializerTest extends TestCase
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/CreatePaymentRequestTest.php b/tests/Request/Payments/CreatePaymentRequestTest.php
index 2df792aa..72c8c5e6 100644
--- a/tests/Request/Payments/CreatePaymentRequestTest.php
+++ b/tests/Request/Payments/CreatePaymentRequestTest.php
@@ -8,6 +8,7 @@ use YooKassa\Model\ConfirmationAttributes\ConfirmationAttributesExternal;
use YooKassa\Model\ConfirmationType;
use YooKassa\Model\CurrencyCode;
use YooKassa\Model\Deal\PaymentDealInfo;
+use YooKassa\Model\FraudData;
use YooKassa\Model\Locale;
use YooKassa\Model\Metadata;
use YooKassa\Model\MonetaryAmount;
@@ -648,7 +649,7 @@ class CreatePaymentRequestTest extends TestCase
$metadata = new Metadata();
$metadata->test = 'test';
$transfers = array();
- for($i = 0; $i < 10; $i++) {
+ for ($i = 0; $i < 10; $i++) {
$transfers[$i][] = array(
'account_id' => (string)Random::int(11111111, 99999999),
'amount' => array(
@@ -759,6 +760,51 @@ class CreatePaymentRequestTest extends TestCase
}
}
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testFraudData($options)
+ {
+ $instance = new CreatePaymentRequest();
+
+ self::assertFalse($instance->hasFraudData());
+ self::assertNull($instance->getFraudData());
+ self::assertNull($instance->fraud_data);
+
+ $expected = $options['fraud_data'];
+ if ($expected instanceof FraudData) {
+ $expected = $expected->toArray();
+ }
+
+ $instance->setFraudData($options['fraud_data']);
+ if (empty($options['fraud_data'])) {
+ self::assertFalse($instance->hasFraudData());
+ self::assertNull($instance->getFraudData());
+ self::assertNull($instance->fraud_data);
+ } else {
+ self::assertTrue($instance->hasFraudData());
+ self::assertSame($expected, $instance->getFraudData()->toArray());
+ self::assertSame($expected, $instance->fraud_data->toArray());
+ }
+
+ $instance->setFraudData(null);
+ self::assertFalse($instance->hasFraudData());
+ self::assertNull($instance->getFraudData());
+ self::assertNull($instance->fraud_data);
+
+ $instance->fraud_data = $options['fraud_data'];
+ if (empty($options['fraud_data'])) {
+ self::assertFalse($instance->hasFraudData());
+ self::assertNull($instance->getFraudData());
+ self::assertNull($instance->fraud_data);
+ } else {
+ self::assertTrue($instance->hasFraudData());
+ self::assertSame($expected, $instance->getFraudData()->toArray());
+ self::assertSame($expected, $instance->fraud_data->toArray());
+ }
+ }
+
public function testValidate()
{
$instance = new CreatePaymentRequest();
@@ -838,6 +884,17 @@ class CreatePaymentRequestTest extends TestCase
$instance->setDeal($value);
}
+ /**
+ * @dataProvider invalidFraudDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidFraudData($value)
+ {
+ $instance = new CreatePaymentRequest();
+ $instance->setFraudData($value);
+ }
+
public function validDataProvider()
{
$metadata = new Metadata();
@@ -857,6 +914,7 @@ class CreatePaymentRequestTest extends TestCase
'clientIp' => null,
'metadata' => null,
'deal' => null,
+ 'fraud_data' => null,
'merchant_customer_id' => null,
),
),
@@ -877,6 +935,9 @@ class CreatePaymentRequestTest extends TestCase
'id' => Random::str(36, 50),
'settlements' => array()
)),
+ 'fraud_data' => new FraudData(array(
+ 'topped_up_phone' => Random::str(11, 15, '0123456789'),
+ )),
'merchant_customer_id' => '',
),
),
@@ -914,6 +975,9 @@ class CreatePaymentRequestTest extends TestCase
'id' => Random::str(36, 50),
'settlements' => array()
),
+ 'fraud_data' => array(
+ 'topped_up_phone' => Random::str(11, 15, '0123456789'),
+ ),
'merchant_customer_id' => Random::str(36, 50),
);
$result[] = array($request);
@@ -956,6 +1020,9 @@ class CreatePaymentRequestTest extends TestCase
'id' => Random::str(36, 50),
'settlements' => array()
),
+ 'fraud_data' => new FraudData(array(
+ 'topped_up_phone' => Random::str(11, 15, '0123456789'),
+ )),
'merchant_customer_id' => Random::str(36, 50),
)
);
@@ -1040,6 +1107,16 @@ class CreatePaymentRequestTest extends TestCase
);
}
+ public function invalidFraudDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(16, 30, '0123456789')),
+ );
+ }
+
public function invalidBooleanDataProvider()
{
return array(
@@ -1048,4 +1125,4 @@ class CreatePaymentRequestTest extends TestCase
array('test'),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/CreatePaymentResponseTest.php b/tests/Request/Payments/CreatePaymentResponseTest.php
index 957d0677..ed64b469 100644
--- a/tests/Request/Payments/CreatePaymentResponseTest.php
+++ b/tests/Request/Payments/CreatePaymentResponseTest.php
@@ -10,4 +10,4 @@ class CreatePaymentResponseTest extends AbstractPaymentResponseTest
{
return new CreatePaymentResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/Payment/CancelResponseTest.php b/tests/Request/Payments/Payment/CancelResponseTest.php
index 81d0253a..8397b3bb 100644
--- a/tests/Request/Payments/Payment/CancelResponseTest.php
+++ b/tests/Request/Payments/Payment/CancelResponseTest.php
@@ -11,4 +11,4 @@ class CancelResponseTest extends AbstractPaymentResponseTest
{
return new CancelResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/Payment/CreateCaptureRequestBuilderTest.php b/tests/Request/Payments/Payment/CreateCaptureRequestBuilderTest.php
index da6af1bf..172677ee 100644
--- a/tests/Request/Payments/Payment/CreateCaptureRequestBuilderTest.php
+++ b/tests/Request/Payments/Payment/CreateCaptureRequestBuilderTest.php
@@ -155,7 +155,10 @@ class CreateCaptureRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptItem(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getQuantity(), $item->getVatCode()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getQuantity(),
+ $item->getVatCode()
);
} else {
$builder->addReceiptItem($item['title'], $item['price'], $item['quantity'], $item['vatCode']);
@@ -187,7 +190,9 @@ class CreateCaptureRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptShipping(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getVatCode()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getVatCode()
);
} else {
$builder->addReceiptShipping($item['title'], $item['price'], $item['vatCode']);
@@ -612,4 +617,4 @@ class CreateCaptureRequestBuilderTest extends TestCase
$builder = new CreateCaptureRequestBuilder();
$builder->setDeal($value);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/Payment/CreateCaptureRequestSerializerTest.php b/tests/Request/Payments/Payment/CreateCaptureRequestSerializerTest.php
index f0ecc91b..09ade53d 100644
--- a/tests/Request/Payments/Payment/CreateCaptureRequestSerializerTest.php
+++ b/tests/Request/Payments/Payment/CreateCaptureRequestSerializerTest.php
@@ -186,7 +186,7 @@ class CreateCaptureRequestSerializerTest extends TestCase
),
'customer' => array(
'phone' => Random::str(12, '0123456789'),
- 'email' => Random::str(10 ),
+ 'email' => Random::str(10),
'full_name' => Random::str(1, 256),
'inn' => Random::str(12, 12, '1234567890')
),
@@ -210,4 +210,4 @@ class CreateCaptureRequestSerializerTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/Payment/CreateCaptureRequestTest.php b/tests/Request/Payments/Payment/CreateCaptureRequestTest.php
index d4e152b9..634aaec1 100644
--- a/tests/Request/Payments/Payment/CreateCaptureRequestTest.php
+++ b/tests/Request/Payments/Payment/CreateCaptureRequestTest.php
@@ -134,4 +134,4 @@ class CreateCaptureRequestTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/PaymentResponseTest.php b/tests/Request/Payments/PaymentResponseTest.php
index 5ddfcd19..b757d15e 100644
--- a/tests/Request/Payments/PaymentResponseTest.php
+++ b/tests/Request/Payments/PaymentResponseTest.php
@@ -10,4 +10,4 @@ class PaymentResponseTest extends AbstractPaymentResponseTest
{
return new PaymentResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/PaymentsRequestBuilderTest.php b/tests/Request/Payments/PaymentsRequestBuilderTest.php
index df6f6086..97b81d28 100644
--- a/tests/Request/Payments/PaymentsRequestBuilderTest.php
+++ b/tests/Request/Payments/PaymentsRequestBuilderTest.php
@@ -328,4 +328,4 @@ class PaymentsRequestBuilderTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/PaymentsRequestSerializerTest.php b/tests/Request/Payments/PaymentsRequestSerializerTest.php
index 92af2119..6c1d72a2 100644
--- a/tests/Request/Payments/PaymentsRequestSerializerTest.php
+++ b/tests/Request/Payments/PaymentsRequestSerializerTest.php
@@ -107,4 +107,4 @@ class PaymentsRequestSerializerTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/PaymentsRequestTest.php b/tests/Request/Payments/PaymentsRequestTest.php
index 4f68f51c..db3a6acf 100644
--- a/tests/Request/Payments/PaymentsRequestTest.php
+++ b/tests/Request/Payments/PaymentsRequestTest.php
@@ -348,9 +348,9 @@ class PaymentsRequestTest extends TestCase
private function getterAndSetterTest($value, $property, $expected, $testHas = true)
{
- $getter = 'get'.ucfirst($property);
- $setter = 'set'.ucfirst($property);
- $has = 'has'.ucfirst($property);
+ $getter = 'get' . ucfirst($property);
+ $setter = 'set' . ucfirst($property);
+ $has = 'has' . ucfirst($property);
$instance = $this->getTestInstance();
@@ -407,4 +407,4 @@ class PaymentsRequestTest extends TestCase
}
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payments/PaymentsResponseTest.php b/tests/Request/Payments/PaymentsResponseTest.php
index 273de8f7..8bf2227b 100644
--- a/tests/Request/Payments/PaymentsResponseTest.php
+++ b/tests/Request/Payments/PaymentsResponseTest.php
@@ -299,4 +299,4 @@ class PaymentsResponseTest extends TestCase
)
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/AbstractPayoutResponseTest.php b/tests/Request/Payouts/AbstractPayoutResponseTest.php
index 1231987c..6e38bcc4 100644
--- a/tests/Request/Payouts/AbstractPayoutResponseTest.php
+++ b/tests/Request/Payouts/AbstractPayoutResponseTest.php
@@ -220,5 +220,4 @@ abstract class AbstractPayoutResponseTest extends TestCase
}
return $result;
}
-
}
diff --git a/tests/Request/Payouts/CreatePayoutRequestBuilderTest.php b/tests/Request/Payouts/CreatePayoutRequestBuilderTest.php
new file mode 100644
index 00000000..8e7f3cb4
--- /dev/null
+++ b/tests/Request/Payouts/CreatePayoutRequestBuilderTest.php
@@ -0,0 +1,478 @@
+factory(Random::value(PayoutDestinationType::getValidValues()));
+ }
+
+ return $result;
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetDeal($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($this->getRequiredData('deal'));
+ $builder->setAmount($options['amount']);
+ $builder->setDeal($options['deal']);
+ $instance = $builder->build();
+
+ if (empty($options['deal'])) {
+ self::assertNull($instance->getDeal());
+ } else {
+ self::assertNotNull($instance->getDeal());
+ self::assertEquals($options['deal'], $instance->getDeal()->toArray());
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetSelfEmployed($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($this->getRequiredData('self_employed'));
+ $builder->setAmount($options['amount']);
+ $builder->setSelfEmployed($options['self_employed']);
+ $instance = $builder->build();
+
+ if (empty($options['self_employed'])) {
+ self::assertNull($instance->getSelfEmployed());
+ } else {
+ self::assertNotNull($instance->getSelfEmployed());
+ if (is_array($options['self_employed'])) {
+ self::assertEquals($options['self_employed'], $instance->getSelfEmployed()->toArray());
+ } else {
+ self::assertEquals($options['self_employed'], $instance->getSelfEmployed());
+ }
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetReceiptData($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($this->getRequiredData('receipt_data'));
+ $builder->setAmount($options['amount']);
+ $builder->setReceiptData($options['receipt_data']);
+ $instance = $builder->build();
+
+ if (empty($options['receipt_data'])) {
+ self::assertNull($instance->getReceiptData());
+ } else {
+ self::assertNotNull($instance->getReceiptData());
+ if (is_array($options['receipt_data'])) {
+ self::assertEquals($options['receipt_data'], $instance->getReceiptData()->toArray());
+ } else {
+ self::assertEquals($options['receipt_data'], $instance->getReceiptData());
+ }
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetAmount($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($this->getRequiredData('amount'));
+ $instance = $builder->build($this->getRequiredData());
+ self::assertNotNull($instance->getAmount());
+
+ $builder->setAmount($options['amount']);
+ $instance = $builder->build($this->getRequiredData('amount'));
+
+ if ($options['amount'] instanceof AmountInterface) {
+ self::assertEquals($options['amount']->getValue(), $instance->getAmount()->getValue());
+ } else {
+ self::assertEquals($options['amount'], $instance->getAmount()->getValue());
+ }
+
+ $builder->setAmount(10000)->setAmount($options['amount']);
+ $instance = $builder->build($this->getRequiredData('amount'));
+
+ if ($options['amount'] instanceof AmountInterface) {
+ self::assertEquals($options['amount']->getValue(), $instance->getAmount()->getValue());
+ } else {
+ self::assertEquals($options['amount'], $instance->getAmount()->getValue());
+ }
+
+ if (!($options['amount'] instanceof AmountInterface)) {
+ $builder->setAmount(array(
+ 'value' => $options['amount'],
+ 'currency' => 'EUR',
+ ));
+ $instance = $builder->build($this->getRequiredData('amount'));
+ self::assertEquals($options['amount'], $instance->getAmount()->getValue());
+ }
+ }
+
+ /**
+ * @expectedException InvalidArgumentException
+ * @dataProvider invalidAmountDataProvider
+ *
+ * @param $value
+ */
+ public function testSetInvalidAmount($value)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setAmount($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetPayoutToken($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($options);
+ $builder->setAmount($options['amount']);
+ $builder->setPayoutToken($options['payoutToken']);
+ $instance = $builder->build();
+
+ if (empty($options['payoutToken'])) {
+ self::assertNull($instance->getPayoutToken());
+ } else {
+ self::assertNotNull($instance->getPayoutToken());
+ self::assertEquals($options['payoutToken'], $instance->getPayoutToken());
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetPaymentMethodId($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($this->getRequiredData('paymentMethodId'));
+ $builder->setAmount($options['amount']);
+ $builder->setPaymentMethodId($options['paymentMethodId']);
+ $instance = $builder->build();
+
+ if (empty($options['paymentMethodId'])) {
+ self::assertNull($instance->getPaymentMethodId());
+ } else {
+ self::assertNotNull($instance->getPaymentMethodId());
+ self::assertEquals($options['paymentMethodId'], $instance->getPaymentMethodId());
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetPayoutDestinationData($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setOptions($options);
+ $builder->setAmount($options['amount']);
+ $builder->setPayoutDestinationData($options['payoutDestinationData']);
+ $instance = $builder->build();
+
+ if (empty($options['payoutDestinationData'])) {
+ self::assertNull($instance->getPayoutDestinationData());
+ } else {
+ self::assertNotNull($instance->getPayoutDestinationData());
+ if (is_array($options['payoutDestinationData'])) {
+ self::assertEquals($options['payoutDestinationData'], $instance->getPayoutDestinationData()->toArray());
+ } else {
+ self::assertEquals($options['payoutDestinationData'], $instance->getPayoutDestinationData());
+ }
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetMetadata($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+
+ $instance = $builder->build($this->getRequiredData());
+ self::assertNull($instance->getMetadata());
+
+ $builder->setMetadata($options['metadata']);
+ $instance = $builder->build($this->getRequiredData());
+
+ if (empty($options['metadata'])) {
+ self::assertNull($instance->getMetadata());
+ } else {
+ self::assertEquals($options['metadata'], $instance->getMetadata()->toArray());
+ }
+ }
+
+ public function invalidRecipientDataProvider()
+ {
+ return array(
+ array(null),
+ array(true),
+ array(false),
+ array(1),
+ array(1.1),
+ array('test'),
+ array(new \stdClass()),
+ );
+ }
+
+ /**
+ * @return array
+ * @throws Exception
+ */
+ public function validDataProvider()
+ {
+ $payoutDestinationData = array(
+ array(
+ 'type' => PaymentMethodType::YOO_MONEY,
+ 'account_number' => Random::str(11, 33, '0123456789')
+ ),
+ array(
+ 'type' => PaymentMethodType::BANK_CARD,
+ 'card' => array(
+ 'number' => Random::str(16, 16, '0123456789'),
+ ),
+ ),
+ array(
+ 'type' => PaymentMethodType::SBP,
+ 'phone' => Random::str(4, 11, '0123456789'),
+ 'bank_id' => Random::str(4, 12, '0123456789'),
+ ),
+ );
+
+ $result = array(
+ array(
+ array(
+ 'description' => null,
+ 'amount' => new MonetaryAmount(Random::int(1, 1000)),
+ 'currency' => Random::value(CurrencyCode::getValidValues()),
+ 'payoutToken' => uniqid('', true),
+ 'paymentMethodId' => null,
+ 'payoutDestinationData' => null,
+ 'confirmation' => null,
+ 'metadata' => null,
+ 'deal' => array(
+ 'id' => Random::str(36, 50),
+ ),
+ 'self_employed' => null,
+ 'receipt_data' => null,
+ ),
+ ),
+ array(
+ array(
+ 'description' => '',
+ 'amount' => new MonetaryAmount(Random::int(1, 1000)),
+ 'currency' => Random::value(CurrencyCode::getValidValues()),
+ 'payoutToken' => null,
+ 'paymentMethodId' => '',
+ 'payoutDestinationData' => Random::value($payoutDestinationData),
+ 'metadata' => array(),
+ 'deal' => array(
+ 'id' => Random::str(36, 50),
+ ),
+ 'self_employed' => new PayoutSelfEmployedInfo(array(
+ 'id' => Random::str(36, 50),
+ )),
+ 'receipt_data' => new IncomeReceiptData(array(
+ 'service_name' => Random::str(36, 50),
+ 'amount' => new MonetaryAmount(Random::int(1, 99)),
+ )),
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $even = (bool)($i % 2);
+ $request = array(
+ 'description' => uniqid('', true),
+ 'amount' => mt_rand(1, 100000),
+ 'currency' => CurrencyCode::RUB,
+ 'paymentMethodId' => uniqid('', true),
+ 'payoutToken' => $even ? null : uniqid('', true),
+ 'payoutDestinationData' => $even ? Random::value($payoutDestinationData) : null,
+ 'metadata' => array('test' => 'test'),
+ 'deal' => array(
+ 'id' => Random::str(36, 50),
+ ),
+ 'self_employed' => new PayoutSelfEmployedInfo(array(
+ 'id' => Random::str(36, 50),
+ )),
+ 'receipt_data' => array(
+ 'service_name' => Random::str(36, 50),
+ 'amount' => array('value' => Random::int(1, 99), 'currency' => CurrencyCode::RUB),
+ ),
+ );
+ $result[] = array($request);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @return array
+ */
+ public function invalidAmountDataProvider()
+ {
+ return array(
+ array(-1),
+ array(true),
+ array(false),
+ array(new \stdClass()),
+ array(0),
+ );
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ *
+ * @param $options
+ * @throws Exception
+ */
+ public function testSetDescription($options)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+
+ $builder->setDescription($options['description']);
+ $instance = $builder->build($this->getRequiredData());
+
+ if (empty($options['description'])) {
+ self::assertNull($instance->getDescription());
+ } else {
+ self::assertEquals($options['description'], $instance->getDescription());
+ }
+ }
+
+ /**
+ * @expectedException InvalidArgumentException
+ */
+ public function testSetInvalidTypeDescription()
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setDescription(true);
+ }
+
+ /**
+ * @expectedException InvalidArgumentException
+ */
+ public function testSetInvalidLengthDescription()
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $description = Random::str(Payout::MAX_LENGTH_DESCRIPTION + 1);
+ $builder->setDescription($description);
+ }
+
+ /**
+ * @return array
+ * @throws Exception
+ */
+ public function invalidDealDataProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(new \stdClass()),
+ array(0),
+ array(7),
+ array(Random::int(-100, -1)),
+ array(Random::int(7, 100)),
+ );
+ }
+
+ /**
+ * @dataProvider invalidDealDataProvider
+ * @expectedException InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidDeal($value)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setDeal($value);
+ }
+
+ /**
+ * @return array
+ * @throws Exception
+ */
+ public function invalidSelfEmployedProvider()
+ {
+ return array(
+ array(true),
+ array(false),
+ array(new \stdClass()),
+ array(0),
+ array(7),
+ array(Random::int(-100, -1)),
+ array(Random::int(7, 100)),
+ );
+ }
+
+ /**
+ * @dataProvider invalidSelfEmployedProvider
+ * @expectedException InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidSelfEmployed($value)
+ {
+ $builder = new CreatePayoutRequestBuilder();
+ $builder->setSelfEmployed($value);
+ }
+}
diff --git a/tests/Request/Payouts/CreatePayoutRequestSerializerTest.php b/tests/Request/Payouts/CreatePayoutRequestSerializerTest.php
new file mode 100644
index 00000000..8f9277ef
--- /dev/null
+++ b/tests/Request/Payouts/CreatePayoutRequestSerializerTest.php
@@ -0,0 +1,97 @@
+build($options);
+ $data = $serializer->serialize($instance);
+
+ $request = new CreatePayoutRequest($options);
+ $expected = $request->toArray();
+
+ self::assertEquals($expected, $data);
+ }
+
+ /**
+ * @return array
+ * @throws \Exception
+ */
+ public function validDataProvider()
+ {
+ $metadata = new Metadata();
+ $metadata->test = 'test';
+ $result = array(
+ array(
+ array(
+ 'amount' => new MonetaryAmount(Random::int(1, 1000000)),
+ 'payoutToken' => uniqid('', true),
+ 'payoutDestinationData' => null,
+ 'metadata' => null,
+ 'description' => null,
+ 'deal' => null,
+ 'payment_method_id' => null,
+ 'self_employed' => null,
+ 'receipt_data' => null,
+ 'personal_data' => null,
+ ),
+ ),
+ array(
+ array(
+ 'amount' => new MonetaryAmount(Random::int(1, 1000000)),
+ 'payoutToken' => '',
+ 'payoutDestinationData' => new PayoutDestinationDataYooMoney(),
+ 'metadata' => array(),
+ 'description' => '',
+ 'deal' => '',
+ 'payment_method_id' => '',
+ 'self_employed' => array(),
+ 'receipt_data' => array(),
+ 'personal_data' => array(),
+ ),
+ ),
+ );
+ $factory = new PayoutDestinationDataFactory();
+ for ($i = 0; $i < 10; $i++) {
+ $even = (bool)($i % 2);
+ $request = array(
+ 'amount' => new MonetaryAmount(Random::int(1, 1000000)),
+ 'payoutToken' => $even ? null : uniqid('', true),
+ 'payoutDestinationData' => $even ? $factory->factory(Random::value(PayoutDestinationType::getValidValues())) : null,
+ 'metadata' => $even ? $metadata : array('test' => 'test'),
+ 'description' => Random::str(5, 128),
+ 'deal' => $even ? new PayoutDealInfo(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50)),
+ 'payment_method_id' => Random::str(5, 128),
+ 'self_employed' => $even ? new PayoutSelfEmployedInfo(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50)),
+ 'receipt_data' => $even ? new IncomeReceiptData(array('service_name' => Random::str(36, 50), 'amount' => new MonetaryAmount(Random::int(1, 1000000)))) : array('service_name' => Random::str(36, 50), 'amount' => array('value' => Random::int(1, 1000000).'.00', 'currency' => CurrencyCode::RUB)),
+ 'personal_data' => array($even ? new PayoutPersonalData(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50))),
+ );
+ $result[] = array($request);
+ }
+
+ return $result;
+ }
+}
diff --git a/tests/Request/Payouts/CreatePayoutRequestTest.php b/tests/Request/Payouts/CreatePayoutRequestTest.php
index b4bdf69f..85ccbb95 100644
--- a/tests/Request/Payouts/CreatePayoutRequestTest.php
+++ b/tests/Request/Payouts/CreatePayoutRequestTest.php
@@ -4,14 +4,18 @@ namespace Tests\YooKassa\Request\Payouts;
use PHPUnit\Framework\TestCase;
use YooKassa\Helpers\Random;
+use YooKassa\Model\CurrencyCode;
use YooKassa\Model\Deal\PayoutDealInfo;
use YooKassa\Model\Metadata;
use YooKassa\Model\MonetaryAmount;
use YooKassa\Model\Payout;
use YooKassa\Request\Payouts\CreatePayoutRequest;
use YooKassa\Request\Payouts\CreatePayoutRequestBuilder;
+use YooKassa\Request\Payouts\IncomeReceiptData;
use YooKassa\Request\Payouts\PayoutDestinationData\PayoutDestinationDataBankCard;
use YooKassa\Request\Payouts\PayoutDestinationData\PayoutDestinationDataYooMoney;
+use YooKassa\Request\Payouts\PayoutPersonalData;
+use YooKassa\Request\Payouts\PayoutSelfEmployedInfo;
class CreatePayoutRequestTest extends TestCase
{
@@ -129,14 +133,99 @@ class CreatePayoutRequestTest extends TestCase
}
/**
- * @dataProvider invalidPayoutTokenDataProvider
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testPaymentMethodId($options)
+ {
+ $instance = new CreatePayoutRequest();
+
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+ self::assertNull($instance->payment_method_id);
+
+ $instance->setPaymentMethodId($options['payment_method_id']);
+ if (empty($options['payment_method_id'])) {
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+ self::assertNull($instance->payment_method_id);
+ } else {
+ self::assertTrue($instance->hasPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->getPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->paymentMethodId);
+ self::assertSame($options['payment_method_id'], $instance->payment_method_id);
+ }
+
+ $instance->setPaymentMethodId(null);
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+
+ $instance->paymentMethodId = $options['payment_method_id'];
+ if (empty($options['payment_method_id'])) {
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+ self::assertNull($instance->payment_method_id);
+ } else {
+ self::assertTrue($instance->hasPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->getPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->paymentMethodId);
+ self::assertSame($options['payment_method_id'], $instance->payment_method_id);
+ }
+
+ $instance->paymentMethodId = null;
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+
+ $instance->payment_method_id = $options['payment_method_id'];
+ if (empty($options['payment_method_id'])) {
+ self::assertFalse($instance->hasPaymentMethodId());
+ self::assertNull($instance->getPaymentMethodId());
+ self::assertNull($instance->paymentMethodId);
+ self::assertNull($instance->payment_method_id);
+ } else {
+ self::assertTrue($instance->hasPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->getPaymentMethodId());
+ self::assertSame($options['payment_method_id'], $instance->paymentMethodId);
+ self::assertSame($options['payment_method_id'], $instance->payment_method_id);
+ }
+ }
+
+ /**
+ * @dataProvider invalidPaymentMethodIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidPaymentMethodId($value)
+ {
+ $instance = new CreatePayoutRequest();
+ $instance->setPaymentMethodId($value);
+ }
+
+ /**
+ * @dataProvider invalidPaymentMethodIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidPaymentMethodId($value)
+ {
+ $instance = new CreatePayoutRequest();
+ $instance->paymentMethodId = $value;
+ }
+
+ /**
+ * @dataProvider invalidPaymentMethodIdDataProvider
* @expectedException \InvalidArgumentException
* @param $value
*/
public function testSetterInvalidPayout_token($value)
{
$instance = new CreatePayoutRequest();
- $instance->payout_token = $value;
+ $instance->payment_method_id = $value;
}
/**
@@ -305,6 +394,203 @@ class CreatePayoutRequestTest extends TestCase
$instance->setDeal($value);
}
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testSelfEmployed($options)
+ {
+ $instance = new CreatePayoutRequest();
+
+ self::assertFalse($instance->hasSelfEmployed());
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+
+ $expected = $options['self_employed'];
+ if ($expected instanceof PayoutSelfEmployedInfo) {
+ $expected = $expected->toArray();
+ }
+
+ $instance->setSelfEmployed($options['self_employed']);
+ if (empty($options['self_employed'])) {
+ self::assertFalse($instance->hasSelfEmployed());
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+ } else {
+ self::assertTrue($instance->hasSelfEmployed());
+ self::assertSame($expected, $instance->getSelfEmployed()->toArray());
+ self::assertSame($expected, $instance->self_employed->toArray());
+ self::assertSame($expected, $instance->selfEmployed->toArray());
+ }
+
+ $instance->setSelfEmployed(null);
+ self::assertFalse($instance->hasSelfEmployed());
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+
+ $instance->self_employed = $options['self_employed'];
+ if (empty($options['self_employed'])) {
+ self::assertFalse($instance->hasSelfEmployed());
+ self::assertNull($instance->getSelfEmployed());
+ self::assertNull($instance->self_employed);
+ self::assertNull($instance->selfEmployed);
+ } else {
+ self::assertTrue($instance->hasSelfEmployed());
+ self::assertSame($expected, $instance->getSelfEmployed()->toArray());
+ self::assertSame($expected, $instance->self_employed->toArray());
+ self::assertSame($expected, $instance->selfEmployed->toArray());
+ }
+ }
+
+ /**
+ * @dataProvider invalidSelfEmployedDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidSelfEmployed($value)
+ {
+ $instance = new CreatePayoutRequest();
+ $instance->setSelfEmployed($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testReceiptData($options)
+ {
+ $instance = new CreatePayoutRequest();
+
+ self::assertFalse($instance->hasReceiptData());
+ self::assertNull($instance->getReceiptData());
+ self::assertNull($instance->receipt_data);
+ self::assertNull($instance->receiptData);
+
+ $expected = $options['receipt_data'];
+ if ($expected instanceof IncomeReceiptData) {
+ $expected = $expected->toArray();
+ }
+
+ $instance->setReceiptData($options['receipt_data']);
+ if (empty($options['receipt_data'])) {
+ self::assertFalse($instance->hasReceiptData());
+ self::assertNull($instance->getReceiptData());
+ self::assertNull($instance->receipt_data);
+ self::assertNull($instance->receiptData);
+ } else {
+ self::assertTrue($instance->hasReceiptData());
+ self::assertSame($expected, $instance->getReceiptData()->toArray());
+ self::assertSame($expected, $instance->receipt_data->toArray());
+ self::assertSame($expected, $instance->receiptData->toArray());
+ }
+
+ $instance->setReceiptData(null);
+ self::assertFalse($instance->hasReceiptData());
+ self::assertNull($instance->getReceiptData());
+ self::assertNull($instance->receipt_data);
+ self::assertNull($instance->receiptData);
+
+ $instance->receipt_data = $options['receipt_data'];
+ if (empty($options['receipt_data'])) {
+ self::assertFalse($instance->hasReceiptData());
+ self::assertNull($instance->getReceiptData());
+ self::assertNull($instance->receipt_data);
+ self::assertNull($instance->receiptData);
+ } else {
+ self::assertTrue($instance->hasReceiptData());
+ self::assertSame($expected, $instance->getReceiptData()->toArray());
+ self::assertSame($expected, $instance->receipt_data->toArray());
+ self::assertSame($expected, $instance->receiptData->toArray());
+ }
+ }
+
+ /**
+ * @dataProvider invalidReceiptDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidReceiptData($value)
+ {
+ $instance = new CreatePayoutRequest();
+ $instance->setReceiptData($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testPersonalData($options)
+ {
+ $instance = new CreatePayoutRequest();
+
+ self::assertFalse($instance->hasPersonalData());
+ self::assertNull($instance->getPersonalData());
+ self::assertNull($instance->personal_data);
+ self::assertNull($instance->receiptData);
+
+ $instance->setPersonalData($options['personal_data']);
+ if (empty($options['personal_data'])) {
+ self::assertFalse($instance->hasPersonalData());
+ self::assertNull($instance->getPersonalData());
+ self::assertNull($instance->personal_data);
+ self::assertNull($instance->receiptData);
+ } else {
+ self::assertTrue($instance->hasPersonalData());
+ foreach ($options['personal_data'] as $key => $expected) {
+ if ($expected instanceof PayoutPersonalData) {
+ $expected = $expected->toArray();
+ }
+ $array = $instance->getPersonalData();
+ self::assertSame($expected, $array[$key]->toArray());
+ $array = $instance->personal_data;
+ self::assertSame($expected, $array[$key]->toArray());
+ $array = $instance->personalData;
+ self::assertSame($expected, $array[$key]->toArray());
+ }
+ }
+
+ $instance->setPersonalData(null);
+ self::assertFalse($instance->hasPersonalData());
+ self::assertNull($instance->getPersonalData());
+ self::assertNull($instance->personal_data);
+ self::assertNull($instance->personalData);
+
+ $instance->personal_data = $options['personal_data'];
+ if (empty($options['personal_data'])) {
+ self::assertFalse($instance->hasPersonalData());
+ self::assertNull($instance->getPersonalData());
+ self::assertNull($instance->personal_data);
+ self::assertNull($instance->personalData);
+ } else {
+ self::assertTrue($instance->hasPersonalData());
+ foreach ($options['personal_data'] as $key => $expected) {
+ if ($expected instanceof PayoutPersonalData) {
+ $expected = $expected->toArray();
+ }
+ $array = $instance->getPersonalData();
+ self::assertSame($expected, $array[$key]->toArray());
+ $array = $instance->personal_data;
+ self::assertSame($expected, $array[$key]->toArray());
+ $array = $instance->personalData;
+ self::assertSame($expected, $array[$key]->toArray());
+ }
+ }
+ }
+
+ /**
+ * @dataProvider invalidPersonalDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidPersonalData($value)
+ {
+ $instance = new CreatePayoutRequest();
+ $instance->setPersonalData($value);
+ }
+
/**
* @dataProvider validDataProvider
* @param $options
@@ -367,7 +653,7 @@ class CreatePayoutRequestTest extends TestCase
self::assertFalse($instance->validate());
- $amount = new MonetaryAmount();
+ $amount = new MonetaryAmount(1);
$instance->setAmount($amount);
self::assertFalse($instance->validate());
@@ -380,7 +666,16 @@ class CreatePayoutRequestTest extends TestCase
self::assertFalse($instance->validate());
$instance->setDeal(new PayoutDealInfo());
self::assertFalse($instance->validate());
- $instance->setAmount(new MonetaryAmount());
+ $instance->setAmount(new MonetaryAmount(1));
+ self::assertFalse($instance->validate());
+
+ $instance->setPaymentMethodId('test');
+ self::assertFalse($instance->validate());
+ $instance->setPersonalData(array(new PayoutPersonalData()));
+ self::assertFalse($instance->validate());
+ $instance->setReceiptData(new IncomeReceiptData());
+ self::assertFalse($instance->validate());
+ $instance->setSelfEmployed(new PayoutSelfEmployedInfo());
self::assertFalse($instance->validate());
$instance->setPayoutToken(Random::str(10));
@@ -409,6 +704,10 @@ class CreatePayoutRequestTest extends TestCase
'metadata' => null,
'description' => null,
'deal' => null,
+ 'payment_method_id' => null,
+ 'self_employed' => null,
+ 'receipt_data' => null,
+ 'personal_data' => null,
),
),
array(
@@ -419,6 +718,10 @@ class CreatePayoutRequestTest extends TestCase
'metadata' => array(),
'description' => '',
'deal' => '',
+ 'payment_method_id' => '',
+ 'self_employed' => array(),
+ 'receipt_data' => array(),
+ 'personal_data' => array(),
),
),
);
@@ -430,6 +733,10 @@ class CreatePayoutRequestTest extends TestCase
'metadata' => ($i % 2) ? $metadata : array('test' => 'test'),
'description' => Random::str(5, 128),
'deal' => ($i % 2) ? new PayoutDealInfo(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50)),
+ 'payment_method_id' => Random::str(5, 128),
+ 'self_employed' => ($i % 2) ? new PayoutSelfEmployedInfo(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50)),
+ 'receipt_data' => ($i % 2) ? new IncomeReceiptData(array('service_name' => Random::str(36, 50), 'amount' => new MonetaryAmount(Random::int(1, 1000000)))) : array('service_name' => Random::str(36, 50), 'amount' => array('value' => Random::int(1, 1000000).'.00', 'currency' => CurrencyCode::RUB)),
+ 'personal_data' => array(($i % 2) ? new PayoutPersonalData(array('id' => Random::str(36, 50))) : array('id' => Random::str(36, 50))),
);
$result[] = array($request);
}
@@ -499,4 +806,44 @@ class CreatePayoutRequestTest extends TestCase
);
}
-}
\ No newline at end of file
+ public function invalidPaymentMethodIdDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ );
+ }
+
+ public function invalidSelfEmployedDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+
+ public function invalidReceiptDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+
+ public function invalidPersonalDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ array(array(new \stdClass())),
+ );
+ }
+
+}
diff --git a/tests/Request/Payouts/IncomeReceiptDataTest.php b/tests/Request/Payouts/IncomeReceiptDataTest.php
new file mode 100644
index 00000000..bb152529
--- /dev/null
+++ b/tests/Request/Payouts/IncomeReceiptDataTest.php
@@ -0,0 +1,91 @@
+getTestInstance($options);
+ self::assertEquals($options['service_name'], $instance->getServiceName());
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+
+ for ($i = 0; $i < 10; $i++) {
+ $deal = array(
+ 'service_name' => Random::str(36, IncomeReceipt::MAX_LENGTH_SERVICE_NAME),
+ 'amount' => new MonetaryAmount(Random::int(1, 1000000)),
+ );
+ $result[] = array($deal);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @dataProvider invalidServiceNameDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidServiceName($value)
+ {
+ $instance = new IncomeReceiptData();
+ $instance->setServiceName($value);
+ }
+
+ public function invalidServiceNameDataProvider()
+ {
+ return array(
+ array(null),
+ array(''),
+ array(false),
+ array(true),
+ array(array()),
+ array(Random::str(IncomeReceipt::MAX_LENGTH_SERVICE_NAME + 1, 60)),
+ );
+ }
+
+ /**
+ * @dataProvider invalidAmountDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidAmountToken($value)
+ {
+ $instance = new IncomeReceiptData();
+ $instance->setAmount($value);
+ }
+
+ public function invalidAmountDataProvider()
+ {
+ return array(
+ array(null),
+ array(''),
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ );
+ }
+}
diff --git a/tests/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationDataTest.php b/tests/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationDataTest.php
index 30af5561..fdba6ce5 100644
--- a/tests/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationDataTest.php
+++ b/tests/Request/Payouts/PayoutDestinationData/AbstractPayoutDestinationDataTest.php
@@ -54,6 +54,6 @@ class TestPaymentData extends AbstractPayoutDestinationData
{
public function __construct($type)
{
- $this->_setType($type);
+ $this->setType($type);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardTest.php b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardTest.php
index 62255115..4013b074 100644
--- a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardTest.php
+++ b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataBankCardTest.php
@@ -80,7 +80,6 @@ class PayoutDestinationDataBankCardTest extends AbstractPayoutDestinationDataTes
public function testSetInvalidCard($value)
{
$this->getTestInstance()->setCard($value);
-
}
/**
@@ -122,4 +121,4 @@ class PayoutDestinationDataBankCardTest extends AbstractPayoutDestinationDataTes
array(array('number' => Random::str(16))),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactoryTest.php b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactoryTest.php
index 1fabbe7c..d4dfec27 100644
--- a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactoryTest.php
+++ b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataFactoryTest.php
@@ -132,4 +132,4 @@ class PayoutDestinationDataFactoryTest extends TestCase
array(array('type' => 'test')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbpTest.php b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbpTest.php
new file mode 100644
index 00000000..1311bf04
--- /dev/null
+++ b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataSbpTest.php
@@ -0,0 +1,178 @@
+getTestInstance();
+
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $instance->setPhone($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getPhone());
+ self::assertEquals($expected, $instance->phone);
+ }
+
+ $instance = $this->getTestInstance();
+ $instance->phone = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getPhone());
+ self::assertEquals($expected, $instance->phone);
+ }
+ }
+
+ /**
+ * @dataProvider invalidPhoneDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetInvalidPhone($value)
+ {
+ $this->getTestInstance()->setPhone($value);
+ }
+
+ /**
+ * @dataProvider invalidPhoneDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetterInvalidPhone($value)
+ {
+ $this->getTestInstance()->phone = $value;
+ }
+
+ /**
+ * @dataProvider validBankIdDataProvider
+ * @param string $value
+ */
+ public function testGetSetBankId($value)
+ {
+ $instance = $this->getTestInstance();
+
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+
+ $instance->setBankId($value);
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getBankId());
+ self::assertEquals($expected, $instance->bankId);
+ self::assertEquals($expected, $instance->bank_id);
+ }
+
+ $instance = $this->getTestInstance();
+ $instance->bankId = $value;
+ if ($value === null || $value === '') {
+ self::assertNull($instance->getBankId());
+ self::assertNull($instance->bankId);
+ self::assertNull($instance->bank_id);
+ } else {
+ $expected = $value;
+ self::assertEquals($expected, $instance->getBankId());
+ self::assertEquals($expected, $instance->bankId);
+ self::assertEquals($expected, $instance->bank_id);
+ }
+ }
+
+ /**
+ * @dataProvider invalidBankIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetInvalidBankId($value)
+ {
+ $this->getTestInstance()->setBankId($value);
+ }
+
+ /**
+ * @dataProvider invalidBankIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param mixed $value
+ */
+ public function testSetterInvalidBankId($value)
+ {
+ $this->getTestInstance()->bankId = $value;
+ }
+
+ public function validPhoneDataProvider()
+ {
+ return array(
+ array(Random::str(4, 16, '0123456789')),
+ array(Random::str(4, 16, '0123456789')),
+ );
+ }
+
+ public function invalidPhoneDataProvider()
+ {
+ return array(
+ array(array()),
+ array(null),
+ array(''),
+ array(true),
+ array(new \stdClass()),
+ array(new \Datetime()),
+ );
+ }
+
+ public function validBankIdDataProvider()
+ {
+ return array(
+ array(Random::str(7, 12, '0123456789')),
+ array(Random::str(7, 12, '0123456789')),
+ );
+ }
+
+ public function invalidBankIdDataProvider()
+ {
+ return array(
+ array(array()),
+ array(null),
+ array(''),
+ array(true),
+ array(new \stdClass()),
+ array(new \Datetime()),
+ array(Random::str(13)),
+ );
+ }
+}
diff --git a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoneyTest.php b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoneyTest.php
index 2926f5ae..4f9714c8 100644
--- a/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoneyTest.php
+++ b/tests/Request/Payouts/PayoutDestinationData/PayoutDestinationDataYooMoneyTest.php
@@ -70,7 +70,6 @@ class PayoutDestinationDataYooMoneyTest extends AbstractPayoutDestinationDataTes
public function testSetInvalidAccountNumber($value)
{
$this->getTestInstance()->setAccountNumber($value);
-
}
/**
@@ -106,4 +105,4 @@ class PayoutDestinationDataYooMoneyTest extends AbstractPayoutDestinationDataTes
array(Random::str(1, 10, '0123456789')),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/PayoutPersonalDataTest.php b/tests/Request/Payouts/PayoutPersonalDataTest.php
new file mode 100644
index 00000000..d19358d8
--- /dev/null
+++ b/tests/Request/Payouts/PayoutPersonalDataTest.php
@@ -0,0 +1,77 @@
+getTestInstance($options);
+ self::assertEquals($options['id'], $instance->getId());
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+
+ for ($i = 0; $i < 10; $i++) {
+ $deal = array(
+ 'id' => Random::str(36, 50),
+ );
+ $result[] = array($deal);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new PayoutPersonalData();
+ $instance->setId($value);
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new PayoutPersonalData();
+ $instance->id = $value;
+ }
+
+ public function invalidIdDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(array()),
+ array(Random::str(1, 35)),
+ array(Random::str(51, 60)),
+ );
+ }
+}
diff --git a/tests/Request/Payouts/PayoutResponseTest.php b/tests/Request/Payouts/PayoutResponseTest.php
index 9e4f986e..bf1226f7 100644
--- a/tests/Request/Payouts/PayoutResponseTest.php
+++ b/tests/Request/Payouts/PayoutResponseTest.php
@@ -10,4 +10,4 @@ class PayoutResponseTest extends AbstractPayoutResponseTest
{
return new PayoutResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Payouts/PayoutSelfEmployedInfoTest.php b/tests/Request/Payouts/PayoutSelfEmployedInfoTest.php
new file mode 100644
index 00000000..a4baff40
--- /dev/null
+++ b/tests/Request/Payouts/PayoutSelfEmployedInfoTest.php
@@ -0,0 +1,77 @@
+getTestInstance($options);
+ self::assertEquals($options['id'], $instance->getId());
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+
+ for ($i = 0; $i < 10; $i++) {
+ $deal = array(
+ 'id' => Random::str(36, 50),
+ );
+ $result[] = array($deal);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new PayoutSelfEmployedInfo();
+ $instance->setId($value);
+ }
+
+ /**
+ * @dataProvider invalidIdDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new PayoutSelfEmployedInfo();
+ $instance->id = $value;
+ }
+
+ public function invalidIdDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(array()),
+ array(Random::str(1, 35)),
+ array(Random::str(51, 60)),
+ );
+ }
+}
diff --git a/tests/Request/Payouts/SbpBanksResponseTest.php b/tests/Request/Payouts/SbpBanksResponseTest.php
new file mode 100644
index 00000000..4e2f9caf
--- /dev/null
+++ b/tests/Request/Payouts/SbpBanksResponseTest.php
@@ -0,0 +1,95 @@
+getType());
+ self::assertEquals(count($options['items']), count($instance->getItems()));
+
+ foreach ($instance->getItems() as $index => $item) {
+ self::assertTrue($item instanceof SbpParticipantBank);
+ self::assertArrayHasKey($index, $options['items']);
+ self::assertEquals($options['items'][$index]['bank_id'], $item->getBankId());
+ self::assertEquals($options['items'][$index]['name'], $item->getName());
+ self::assertEquals($options['items'][$index]['bic'], $item->getBic());
+ }
+ }
+
+ public function validDataProvider()
+ {
+ return array(
+ array(
+ array(
+ 'type' => 'list',
+ 'items' => array(),
+ ),
+ ),
+ array(
+ array(
+ 'type' => 'list',
+ 'items' => array(
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ ),
+ ),
+ ),
+ array(
+ array(
+ 'type' => 'list',
+ 'items' => array(
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ ),
+ ),
+ ),
+ array(
+ array(
+ 'type' => 'list',
+ 'items' => array(
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ array(
+ 'bank_id' => Random::str(36),
+ 'name' => Random::str(36),
+ 'bic' => Random::str(36),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+}
diff --git a/tests/Request/PersonalData/CreatePersonalDataRequestTest.php b/tests/Request/PersonalData/CreatePersonalDataRequestTest.php
new file mode 100644
index 00000000..56720fa0
--- /dev/null
+++ b/tests/Request/PersonalData/CreatePersonalDataRequestTest.php
@@ -0,0 +1,358 @@
+hasLastName());
+ self::assertNull($instance->getLastName());
+ self::assertNull($instance->last_name);
+
+ $expected = $options['last_name'];
+
+ $instance->setLastName($options['last_name']);
+ if (empty($options['last_name'])) {
+ self::assertFalse($instance->hasLastName());
+ self::assertNull($instance->getLastName());
+ self::assertNull($instance->last_name);
+ } else {
+ self::assertTrue($instance->hasLastName());
+ self::assertSame($expected, $instance->getLastName());
+ self::assertSame($expected, $instance->last_name);
+ }
+
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->hasLastName());
+ self::assertNull($instance->getLastName());
+ self::assertNull($instance->last_name);
+
+ $instance->last_name = $options['last_name'];
+ if (empty($options['last_name'])) {
+ self::assertFalse($instance->hasLastName());
+ self::assertNull($instance->getLastName());
+ self::assertNull($instance->last_name);
+ } else {
+ self::assertTrue($instance->hasLastName());
+ self::assertSame($expected, $instance->getLastName());
+ self::assertSame($expected, $instance->last_name);
+ }
+ }
+
+ /**
+ * @dataProvider invalidLastNameDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidLastName($value)
+ {
+ $instance = new CreatePersonalDataRequest();
+ $instance->setLastName($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testFirstName($options)
+ {
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->hasFirstName());
+ self::assertNull($instance->getFirstName());
+ self::assertNull($instance->first_name);
+
+ $expected = $options['first_name'];
+
+ $instance->setFirstName($options['first_name']);
+ if (empty($options['first_name'])) {
+ self::assertFalse($instance->hasFirstName());
+ self::assertNull($instance->getFirstName());
+ self::assertNull($instance->first_name);
+ } else {
+ self::assertTrue($instance->hasFirstName());
+ self::assertSame($expected, $instance->getFirstName());
+ self::assertSame($expected, $instance->first_name);
+ }
+
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->hasFirstName());
+ self::assertNull($instance->getFirstName());
+ self::assertNull($instance->first_name);
+
+ $instance->first_name = $options['first_name'];
+ if (empty($options['first_name'])) {
+ self::assertFalse($instance->hasFirstName());
+ self::assertNull($instance->getFirstName());
+ self::assertNull($instance->first_name);
+ } else {
+ self::assertTrue($instance->hasFirstName());
+ self::assertSame($expected, $instance->getFirstName());
+ self::assertSame($expected, $instance->first_name);
+ }
+ }
+
+ /**
+ * @dataProvider invalidFirstNameDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidFirstName($value)
+ {
+ $instance = new CreatePersonalDataRequest();
+ $instance->setFirstName($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testMiddleName($options)
+ {
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->hasMiddleName());
+ self::assertNull($instance->getMiddleName());
+ self::assertNull($instance->middle_name);
+
+ $expected = $options['middle_name'];
+
+ $instance->setMiddleName($options['middle_name']);
+ if (empty($options['middle_name'])) {
+ self::assertFalse($instance->hasMiddleName());
+ self::assertNull($instance->getMiddleName());
+ self::assertNull($instance->middle_name);
+ } else {
+ self::assertTrue($instance->hasMiddleName());
+ self::assertSame($expected, $instance->getMiddleName());
+ self::assertSame($expected, $instance->middle_name);
+ }
+
+ $instance->setMiddleName(null);
+ self::assertFalse($instance->hasMiddleName());
+ self::assertNull($instance->getMiddleName());
+ self::assertNull($instance->middle_name);
+
+ $instance->middle_name = $options['middle_name'];
+ if (empty($options['middle_name'])) {
+ self::assertFalse($instance->hasMiddleName());
+ self::assertNull($instance->getMiddleName());
+ self::assertNull($instance->middle_name);
+ } else {
+ self::assertTrue($instance->hasMiddleName());
+ self::assertSame($expected, $instance->getMiddleName());
+ self::assertSame($expected, $instance->middle_name);
+ }
+ }
+
+ /**
+ * @dataProvider invalidMiddleNameDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidMiddleName($value)
+ {
+ $instance = new CreatePersonalDataRequest();
+ $instance->setMiddleName($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testMetadata($options)
+ {
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->hasMetadata());
+ self::assertNull($instance->getMetadata());
+ self::assertNull($instance->metadata);
+
+ $expected = $options['metadata'];
+ if ($expected instanceof Metadata) {
+ $expected = $expected->toArray();
+ }
+
+ $instance->setMetadata($options['metadata']);
+ if (empty($options['metadata'])) {
+ self::assertFalse($instance->hasMetadata());
+ self::assertNull($instance->getMetadata());
+ self::assertNull($instance->metadata);
+ } else {
+ self::assertTrue($instance->hasMetadata());
+ self::assertSame($expected, $instance->getMetadata()->toArray());
+ self::assertSame($expected, $instance->metadata->toArray());
+ }
+
+ $instance->setMetadata(null);
+ self::assertFalse($instance->hasMetadata());
+ self::assertNull($instance->getMetadata());
+ self::assertNull($instance->metadata);
+
+ $instance->metadata = $options['metadata'];
+ if (empty($options['metadata'])) {
+ self::assertFalse($instance->hasMetadata());
+ self::assertNull($instance->getMetadata());
+ self::assertNull($instance->metadata);
+ } else {
+ self::assertTrue($instance->hasMetadata());
+ self::assertSame($expected, $instance->getMetadata()->toArray());
+ self::assertSame($expected, $instance->metadata->toArray());
+ }
+ }
+
+ /**
+ * @dataProvider invalidMetadataDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidMetadata($value)
+ {
+ $instance = new CreatePersonalDataRequest();
+ $instance->setMetadata($value);
+ }
+
+ /**
+ * @dataProvider invalidTypeDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidType($value)
+ {
+ $instance = new CreatePersonalDataRequest();
+ $instance->setType($value);
+ }
+
+ public function testValidate()
+ {
+ $instance = new CreatePersonalDataRequest();
+
+ self::assertFalse($instance->validate());
+
+ $instance->setType(Random::value(PersonalDataType::getEnabledValues()));
+ self::assertFalse($instance->validate());
+
+ $instance->setMiddleName('test');
+ self::assertFalse($instance->validate());
+
+ $instance->setLastName('test');
+ self::assertFalse($instance->validate());
+ $instance->setFirstName('test');
+ self::assertTrue($instance->validate());
+
+ }
+
+ public function testBuilder()
+ {
+ $builder = CreatePersonalDataRequest::builder();
+ self::assertTrue($builder instanceof CreatePersonalDataRequestBuilder);
+ }
+
+ public function validDataProvider()
+ {
+ $metadata = new Metadata();
+ $metadata->test = 'test';
+ $result = array(
+ array(
+ array(
+ 'type' => Random::value(PersonalDataType::getEnabledValues()),
+ 'last_name' => 'null',
+ 'first_name' => 'null',
+ 'middle_name' => null,
+ 'metadata' => null,
+ ),
+ ),
+ array(
+ array(
+ 'type' => Random::value(PersonalDataType::getEnabledValues()),
+ 'last_name' => 'null',
+ 'first_name' => 'null',
+ 'middle_name' => '',
+ 'metadata' => array(),
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $request = array(
+ 'type' => Random::value(PersonalDataType::getEnabledValues()),
+ 'last_name' => Random::str(5, CreatePersonalDataRequest::MAX_LENGTH_LAST_NAME),
+ 'first_name' => Random::str(5, CreatePersonalDataRequest::MAX_LENGTH_FIRST_NAME),
+ 'middle_name' => Random::str(5, CreatePersonalDataRequest::MAX_LENGTH_LAST_NAME),
+ 'metadata' => ($i % 2) ? $metadata : array('test' => 'test'),
+ );
+ $result[] = array($request);
+ }
+ return $result;
+ }
+
+ public function invalidTypeDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+
+ public function invalidMetadataDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(1),
+ array(Random::str(10)),
+ );
+ }
+
+ public function invalidLastNameDataProvider()
+ {
+ return array(
+ array(null),
+ array(''),
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(CreatePersonalDataRequest::MAX_LENGTH_LAST_NAME + 1)),
+ );
+ }
+
+ public function invalidMiddleNameDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(CreatePersonalDataRequest::MAX_LENGTH_LAST_NAME + 1)),
+ );
+ }
+
+ public function invalidFirstNameDataProvider()
+ {
+ return array(
+ array(null),
+ array(''),
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(CreatePersonalDataRequest::MAX_LENGTH_FIRST_NAME + 1)),
+ );
+ }
+
+}
diff --git a/tests/Request/PersonalData/PersonalDataResponseTest.php b/tests/Request/PersonalData/PersonalDataResponseTest.php
new file mode 100644
index 00000000..92da53d3
--- /dev/null
+++ b/tests/Request/PersonalData/PersonalDataResponseTest.php
@@ -0,0 +1,172 @@
+getTypeInstance($options);
+ self::assertEquals($options['id'], $instance->getId());
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetStatus($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ self::assertEquals($options['status'], $instance->getStatus());
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetType($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ self::assertEquals($options['type'], $instance->getType());
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetCreatedAt($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ if (empty($options['created_at'])) {
+ self::assertNull($instance->getCreatedAt());
+ self::assertNull($instance->created_at);
+ self::assertNull($instance->createdAt);
+ } else {
+ self::assertEquals($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetExpiresAt($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ if (empty($options['expires_at'])) {
+ self::assertNull($instance->getExpiresAt());
+ self::assertNull($instance->expires_at);
+ self::assertNull($instance->expiresAt);
+ } else {
+ self::assertEquals($options['expires_at'], $instance->getExpiresAt()->format(YOOKASSA_DATE));
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetCancellationDetails($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ if (empty($options['cancellation_details'])) {
+ self::assertNull($instance->getCancellationDetails());
+ } else {
+ self::assertEquals(
+ $options['cancellation_details']['party'],
+ $instance->getCancellationDetails()->getParty()
+ );
+ self::assertEquals(
+ $options['cancellation_details']['reason'],
+ $instance->getCancellationDetails()->getReason()
+ );
+ }
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetMetadata($options)
+ {
+ $instance = $this->getTypeInstance($options);
+ if (empty($options['metadata'])) {
+ self::assertNull($instance->getMetadata());
+ } else {
+ self::assertEquals($options['metadata'], $instance->getMetadata()->toArray());
+ }
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+ $cancellationDetailsParties = PersonalDataCancellationDetailsPartyCode::getValidValues();
+ $countCancellationDetailsParties = count($cancellationDetailsParties);
+ $cancellationDetailsReasons = PersonalDataCancellationDetailsReasonCode::getValidValues();
+ $countCancellationDetailsReasons = count($cancellationDetailsReasons);
+
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
+ 'expires_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
+ 'metadata' => array('order_id' => '37'),
+ 'cancellation_details' => array(
+ 'party' => Random::value($cancellationDetailsParties),
+ 'reason' => Random::value($cancellationDetailsReasons)
+ ),
+ )
+ );
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'expires_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'metadata' => null,
+ 'cancellation_details' => null,
+ )
+ );
+
+ for ($i = 0; $i < 20; $i++) {
+ $data = array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(PersonalDataStatus::getValidValues()),
+ 'type' => Random::value(PersonalDataType::getValidValues()),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'expires_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'metadata' => array(Random::str(3, 128, 'abcdefghijklmnopqrstuvwxyz') => Random::str(1, 512)),
+ 'cancellation_details' => array(
+ 'party' => $cancellationDetailsParties[$i % $countCancellationDetailsParties],
+ 'reason' => $cancellationDetailsReasons[$i % $countCancellationDetailsReasons]
+ ),
+ );
+ $result[] = array($data);
+ }
+ return $result;
+ }
+}
diff --git a/tests/Request/Receipts/AbstractReceiptResponseTest.php b/tests/Request/Receipts/AbstractReceiptResponseTest.php
index 059d3d53..f1e1aca5 100644
--- a/tests/Request/Receipts/AbstractReceiptResponseTest.php
+++ b/tests/Request/Receipts/AbstractReceiptResponseTest.php
@@ -249,7 +249,7 @@ abstract class AbstractReceiptResponseTest extends TestCase
);
if ($item['measure'] === ReceiptItemMeasure::PIECE) {
$item['mark_quantity'] = array(
- 'numerator' => Random::int(1,100),
+ 'numerator' => Random::int(1, 100),
'denominator' => 100,
);
}
diff --git a/tests/Request/Receipts/CreatePostReceiptRequestSerializerTest.php b/tests/Request/Receipts/CreatePostReceiptRequestSerializerTest.php
index 096e0c58..c474b6b1 100644
--- a/tests/Request/Receipts/CreatePostReceiptRequestSerializerTest.php
+++ b/tests/Request/Receipts/CreatePostReceiptRequestSerializerTest.php
@@ -180,4 +180,4 @@ class CreatePostReceiptRequestSerializerTest extends TestCase
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Receipts/CreatePostReceiptRequestTest.php b/tests/Request/Receipts/CreatePostReceiptRequestTest.php
index e9ac8398..c1cd6a8b 100644
--- a/tests/Request/Receipts/CreatePostReceiptRequestTest.php
+++ b/tests/Request/Receipts/CreatePostReceiptRequestTest.php
@@ -133,8 +133,7 @@ class CreatePostReceiptRequestTest extends TestCase
new Settlement(array(
'type' => SettlementType::PREPAYMENT,
'amount' => new ReceiptItemAmount(10, 'RUB')))
- )
- );
+ ));
self::assertFalse($instance->validate());
$instance->setItems(array());
@@ -404,7 +403,7 @@ class CreatePostReceiptRequestTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateSettlement($i % 2 == 0);
}
diff --git a/tests/Request/Receipts/PaymentReceiptResponseTest.php b/tests/Request/Receipts/PaymentReceiptResponseTest.php
index 6b526544..3f13711a 100644
--- a/tests/Request/Receipts/PaymentReceiptResponseTest.php
+++ b/tests/Request/Receipts/PaymentReceiptResponseTest.php
@@ -240,4 +240,4 @@ class PaymentReceiptResponseTest extends AbstractReceiptResponseTest
{
$this->getTestInstance($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Receipts/ReceiptResponseFactoryTest.php b/tests/Request/Receipts/ReceiptResponseFactoryTest.php
index 6015db6c..287a1cd0 100644
--- a/tests/Request/Receipts/ReceiptResponseFactoryTest.php
+++ b/tests/Request/Receipts/ReceiptResponseFactoryTest.php
@@ -9,7 +9,6 @@ use PHPUnit\Framework\TestCase;
class ReceiptResponseFactoryTest extends TestCase
{
-
/**
* @dataProvider invalidFactoryDataProvider
* @param array $value
diff --git a/tests/Request/Receipts/ReceiptResponseItemTest.php b/tests/Request/Receipts/ReceiptResponseItemTest.php
index 0c0604eb..147a9b8a 100644
--- a/tests/Request/Receipts/ReceiptResponseItemTest.php
+++ b/tests/Request/Receipts/ReceiptResponseItemTest.php
@@ -153,7 +153,7 @@ class ReceiptResponseItemTest extends TestCase
self::assertSame($options['mark_quantity'], $instance->getMarkQuantity()->toArray());
self::assertSame($options['mark_quantity'], $instance->mark_quantity->toArray());
self::assertSame($options['mark_quantity'], $instance->markQuantity->toArray());
- }else {
+ } else {
self::assertNotNull($instance->getMarkQuantity());
self::assertEquals($options['mark_quantity'], $instance->getMarkQuantity());
}
@@ -570,7 +570,7 @@ class ReceiptResponseItemTest extends TestCase
'description' => Random::str(128),
'quantity' => Random::float(0.0001, 99.99),
'amount' => new MonetaryAmount(Random::int(1, 1000)),
- 'vat_code' => Random::int(1,6),
+ 'vat_code' => Random::int(1, 6),
'measure' => null,
'excise' => null,
'payment_mode' => null,
@@ -600,8 +600,8 @@ class ReceiptResponseItemTest extends TestCase
'value' => round(Random::float(0.1, 99.99), 2),
'currency' => Random::value(CurrencyCode::getValidValues())
),
- 'vat_code' => Random::int(1,6),
- 'excise' => round(Random::float(1.0,10.0), 2),
+ 'vat_code' => Random::int(1, 6),
+ 'excise' => round(Random::float(1.0, 10.0), 2),
'payment_mode' => Random::value(PaymentMode::getValidValues()),
'payment_subject' => Random::value(PaymentSubject::getValidValues()),
'product_code' => Random::value(array(
@@ -639,7 +639,7 @@ class ReceiptResponseItemTest extends TestCase
);
if ($test[0]['measure'] === ReceiptItemMeasure::PIECE) {
$test[0]['mark_quantity'] = array(
- 'numerator' => Random::int(1,100),
+ 'numerator' => Random::int(1, 100),
'denominator' => 100,
);
}
diff --git a/tests/Request/Receipts/ReceiptsResponseTest.php b/tests/Request/Receipts/ReceiptsResponseTest.php
index 0d80da1e..a8a8d681 100644
--- a/tests/Request/Receipts/ReceiptsResponseTest.php
+++ b/tests/Request/Receipts/ReceiptsResponseTest.php
@@ -2,7 +2,6 @@
namespace YooKassa\Request\Receipts;
-
use PHPUnit\Framework\TestCase;
use YooKassa\Helpers\Random;
use YooKassa\Helpers\UUID;
@@ -66,7 +65,7 @@ class ReceiptsResponseTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateReceipt();
}
@@ -74,14 +73,15 @@ class ReceiptsResponseTest extends TestCase
}
private function generateReceipt()
- { $type = Random::value(ReceiptType::getEnabledValues());
+ {
+ $type = Random::value(ReceiptType::getEnabledValues());
return array(
'id' => Random::str(39),
'type' => $type,
'status' => Random::value(array('pending', 'succeeded', 'canceled')),
'items' => $this->generateItems(),
'settlements' => $this->generateSettlements(),
- 'tax_system_code' => Random::int(1 ,6),
+ 'tax_system_code' => Random::int(1, 6),
$type . '_id' => UUID::v4(),
);
}
@@ -91,7 +91,7 @@ class ReceiptsResponseTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateItem();
}
@@ -107,7 +107,7 @@ class ReceiptsResponseTest extends TestCase
'currency' => 'RUB',
),
'quantity' => round(Random::float(0.001, 99.999), 3),
- 'vat_code' => Random::int(1 ,6),
+ 'vat_code' => Random::int(1, 6),
);
}
@@ -116,7 +116,7 @@ class ReceiptsResponseTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateSettlement();
}
diff --git a/tests/Request/Receipts/RefundReceiptResponseTest.php b/tests/Request/Receipts/RefundReceiptResponseTest.php
index ef3c86fc..f96a0ea8 100644
--- a/tests/Request/Receipts/RefundReceiptResponseTest.php
+++ b/tests/Request/Receipts/RefundReceiptResponseTest.php
@@ -76,4 +76,4 @@ class RefundReceiptResponseTest extends AbstractReceiptResponseTest
}
self::assertTrue($catch);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Receipts/SimpleReceiptResponseTest.php b/tests/Request/Receipts/SimpleReceiptResponseTest.php
index e7560ce2..b191721c 100644
--- a/tests/Request/Receipts/SimpleReceiptResponseTest.php
+++ b/tests/Request/Receipts/SimpleReceiptResponseTest.php
@@ -27,5 +27,4 @@ class SimpleReceiptResponseTest extends AbstractReceiptResponseTest
$instance = $this->getTestInstance($options);
self::assertEquals($options['id'], $instance->getId());
}
-
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/AbstractRefundResponseTest.php b/tests/Request/Refunds/AbstractRefundResponseTest.php
index 23ca79f3..5dff17a5 100644
--- a/tests/Request/Refunds/AbstractRefundResponseTest.php
+++ b/tests/Request/Refunds/AbstractRefundResponseTest.php
@@ -175,4 +175,4 @@ abstract class AbstractRefundResponseTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/CreateRefundRequestBuilderTest.php b/tests/Request/Refunds/CreateRefundRequestBuilderTest.php
index 973584e6..108c12b3 100644
--- a/tests/Request/Refunds/CreateRefundRequestBuilderTest.php
+++ b/tests/Request/Refunds/CreateRefundRequestBuilderTest.php
@@ -183,7 +183,10 @@ class CreateRefundRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptItem(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getQuantity(), $item->getVatCode()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getQuantity(),
+ $item->getVatCode()
);
} else {
$builder->addReceiptItem($item['title'], $item['price'], $item['quantity'], $item['vatCode']);
@@ -216,7 +219,9 @@ class CreateRefundRequestBuilderTest extends TestCase
foreach ($options['receiptItems'] as $item) {
if ($item instanceof ReceiptItem) {
$builder->addReceiptShipping(
- $item->getDescription(), $item->getPrice()->getValue(), $item->getVatCode()
+ $item->getDescription(),
+ $item->getPrice()->getValue(),
+ $item->getVatCode()
);
} else {
$builder->addReceiptShipping($item['title'], $item['price'], $item['vatCode']);
@@ -711,4 +716,4 @@ class CreateRefundRequestBuilderTest extends TestCase
$builder = new CreatePaymentRequestBuilder();
$builder->setDeal($value);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/CreateRefundRequestSerializerTest.php b/tests/Request/Refunds/CreateRefundRequestSerializerTest.php
index 090fd38a..62efccac 100644
--- a/tests/Request/Refunds/CreateRefundRequestSerializerTest.php
+++ b/tests/Request/Refunds/CreateRefundRequestSerializerTest.php
@@ -201,4 +201,4 @@ class CreateRefundRequestSerializerTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/CreateRefundRequestTest.php b/tests/Request/Refunds/CreateRefundRequestTest.php
index f7d71902..c1a4f77f 100644
--- a/tests/Request/Refunds/CreateRefundRequestTest.php
+++ b/tests/Request/Refunds/CreateRefundRequestTest.php
@@ -410,4 +410,4 @@ class CreateRefundRequestTest extends TestCase
array(new \stdClass()),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/CreateRefundResponseTest.php b/tests/Request/Refunds/CreateRefundResponseTest.php
index 6dbdf676..c6d8c3f1 100644
--- a/tests/Request/Refunds/CreateRefundResponseTest.php
+++ b/tests/Request/Refunds/CreateRefundResponseTest.php
@@ -14,4 +14,4 @@ class CreateRefundResponseTest extends AbstractRefundResponseTest
{
return new CreateRefundResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/RefundResponseTest.php b/tests/Request/Refunds/RefundResponseTest.php
index dbf999ae..a2fb1d7b 100644
--- a/tests/Request/Refunds/RefundResponseTest.php
+++ b/tests/Request/Refunds/RefundResponseTest.php
@@ -14,4 +14,4 @@ class RefundResponseTest extends AbstractRefundResponseTest
{
return new RefundResponse($options);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/RefundsRequestBuilderTest.php b/tests/Request/Refunds/RefundsRequestBuilderTest.php
index 83d15437..990ae07e 100644
--- a/tests/Request/Refunds/RefundsRequestBuilderTest.php
+++ b/tests/Request/Refunds/RefundsRequestBuilderTest.php
@@ -230,4 +230,4 @@ class RefundsRequestBuilderTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/RefundsRequestSerializerTest.php b/tests/Request/Refunds/RefundsRequestSerializerTest.php
index 5d75e858..077069df 100644
--- a/tests/Request/Refunds/RefundsRequestSerializerTest.php
+++ b/tests/Request/Refunds/RefundsRequestSerializerTest.php
@@ -95,4 +95,4 @@ class RefundsRequestSerializerTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/RefundsRequestTest.php b/tests/Request/Refunds/RefundsRequestTest.php
index 807331ed..49a208d6 100644
--- a/tests/Request/Refunds/RefundsRequestTest.php
+++ b/tests/Request/Refunds/RefundsRequestTest.php
@@ -636,4 +636,4 @@ class RefundsRequestTest extends TestCase
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/Refunds/RefundsResponseTest.php b/tests/Request/Refunds/RefundsResponseTest.php
index ec35a71e..a9304a95 100644
--- a/tests/Request/Refunds/RefundsResponseTest.php
+++ b/tests/Request/Refunds/RefundsResponseTest.php
@@ -117,4 +117,4 @@ class RefundsResponseTest extends TestCase
),
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Request/SelfEmployed/AbstractConfirmationTest.php b/tests/Request/SelfEmployed/AbstractConfirmationTest.php
new file mode 100644
index 00000000..2a6e814c
--- /dev/null
+++ b/tests/Request/SelfEmployed/AbstractConfirmationTest.php
@@ -0,0 +1,63 @@
+getTestInstance();
+ self::assertEquals($this->getExpectedType(), $instance->getType());
+ }
+
+ /**
+ * @dataProvider invalidTypeDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testInvalidType($value)
+ {
+ new TestConfirmation($value);
+ }
+
+ /**
+ * @return array
+ * @throws \Exception
+ */
+ public function invalidTypeDataProvider()
+ {
+ return array(
+ array(''),
+ array(null),
+ array(Random::str(40)),
+ array(0),
+ array(array()),
+ array(new \stdClass()),
+ );
+ }
+}
+
+class TestConfirmation extends SelfEmployedRequestConfirmation
+{
+ public function __construct($type)
+ {
+ $this->setType($type);
+ }
+}
diff --git a/tests/Request/SelfEmployed/ConfirmationFactoryTest.php b/tests/Request/SelfEmployed/ConfirmationFactoryTest.php
new file mode 100644
index 00000000..0a74ef0c
--- /dev/null
+++ b/tests/Request/SelfEmployed/ConfirmationFactoryTest.php
@@ -0,0 +1,129 @@
+getTestInstance();
+ $confirmation = $instance->factory($type);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedRequestConfirmation);
+ self::assertEquals($type, $confirmation->getType());
+ }
+
+ /**
+ * @dataProvider invalidTypeDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $type
+ */
+ public function testInvalidFactory($type)
+ {
+ $instance = $this->getTestInstance();
+ $instance->factory($type);
+ }
+
+ /**
+ * @dataProvider validArrayDataProvider
+ * @param array $options
+ */
+ public function testFactoryFromArray($options)
+ {
+ $instance = $this->getTestInstance();
+ $confirmation = $instance->factoryFromArray($options);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedRequestConfirmation);
+
+ foreach ($options as $property => $value) {
+ self::assertEquals($confirmation->{$property}, $value);
+ }
+
+ $type = $options['type'];
+ unset($options['type']);
+ $confirmation = $instance->factoryFromArray($options, $type);
+ self::assertNotNull($confirmation);
+ self::assertTrue($confirmation instanceof SelfEmployedRequestConfirmation);
+
+ self::assertEquals($type, $confirmation->getType());
+ foreach ($options as $property => $value) {
+ self::assertEquals($confirmation->{$property}, $value);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataArrayDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $options
+ */
+ public function testInvalidFactoryFromArray($options)
+ {
+ $instance = $this->getTestInstance();
+ $instance->factoryFromArray($options);
+ }
+
+ public function validTypeDataProvider()
+ {
+ $result = array();
+ foreach (SelfEmployedConfirmationType::getValidValues() as $value) {
+ $result[] = array($value);
+ }
+ return $result;
+ }
+
+ public function invalidTypeDataProvider()
+ {
+ return array(
+ array(''),
+ array(null),
+ array(0),
+ array(1),
+ array(-1),
+ array('5'),
+ array(array()),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+
+ public function validArrayDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'type' => SelfEmployedConfirmationType::REDIRECT,
+ ),
+ ),
+ );
+ foreach (SelfEmployedConfirmationType::getValidValues() as $value) {
+ $result[] = array(array('type' => $value));
+ }
+ return $result;
+ }
+
+ public function invalidDataArrayDataProvider()
+ {
+ return array(
+ array(array()),
+ array(array('type' => 'test')),
+ );
+ }
+}
diff --git a/tests/Request/SelfEmployed/ConfirmationRedirectTest.php b/tests/Request/SelfEmployed/ConfirmationRedirectTest.php
new file mode 100644
index 00000000..ee955ea0
--- /dev/null
+++ b/tests/Request/SelfEmployed/ConfirmationRedirectTest.php
@@ -0,0 +1,25 @@
+getItn());
+ self::assertNull($instance->itn);
+
+ $instance->setItn($options['itn']);
+
+ self::assertSame($options['itn'], $instance->getItn());
+ self::assertSame($options['itn'], $instance->itn);
+ }
+
+ /**
+ * @dataProvider invalidItnDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidItn($value)
+ {
+ $instance = new SelfEmployedRequest();
+ $instance->setItn($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testPhone($options)
+ {
+ $instance = new SelfEmployedRequest();
+
+ self::assertFalse($instance->hasPhone());
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $expected = $options['phone'];
+
+ $instance->setPhone($options['phone']);
+ if (empty($options['phone'])) {
+ self::assertFalse($instance->hasPhone());
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ self::assertTrue($instance->hasPhone());
+ self::assertSame($expected, $instance->getPhone());
+ self::assertSame($expected, $instance->phone);
+ }
+
+ $instance->setPhone(null);
+ self::assertFalse($instance->hasPhone());
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $instance->phone = $options['phone'];
+ if (empty($options['phone'])) {
+ self::assertFalse($instance->hasPhone());
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+ } else {
+ self::assertTrue($instance->hasPhone());
+ self::assertSame($expected, $instance->getPhone());
+ self::assertSame($expected, $instance->phone);
+ }
+ }
+
+ /**
+ * @dataProvider invalidPhoneDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidPhone($value)
+ {
+ $instance = new SelfEmployedRequest();
+ $instance->setPhone($value);
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param $options
+ */
+ public function testConfirmation($options)
+ {
+ $instance = new SelfEmployedRequest();
+
+ self::assertFalse($instance->hasConfirmation());
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+
+ $expected = $options['confirmation'];
+ if ($expected instanceof SelfEmployedRequestConfirmation) {
+ $expected = $expected->toArray();
+ }
+
+ $instance->setConfirmation($options['confirmation']);
+ if (empty($options['confirmation'])) {
+ self::assertFalse($instance->hasConfirmation());
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+ } else {
+ self::assertTrue($instance->hasConfirmation());
+ self::assertSame($expected, $instance->getConfirmation()->toArray());
+ self::assertSame($expected, $instance->confirmation->toArray());
+ }
+
+ $instance->setConfirmation(null);
+ self::assertFalse($instance->hasConfirmation());
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+
+ $instance->confirmation = $options['confirmation'];
+ if (empty($options['confirmation'])) {
+ self::assertFalse($instance->hasConfirmation());
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+ } else {
+ self::assertTrue($instance->hasConfirmation());
+ self::assertSame($expected, $instance->getConfirmation()->toArray());
+ self::assertSame($expected, $instance->confirmation->toArray());
+ }
+ }
+
+ /**
+ * @dataProvider invalidConfirmationDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidConfirmation($value)
+ {
+ $instance = new SelfEmployedRequest();
+ $instance->setConfirmation($value);
+ }
+
+ public function testValidate()
+ {
+ $instance = new SelfEmployedRequest();
+
+ self::assertFalse($instance->validate());
+
+ $instance->setItn(null);
+ self::assertFalse($instance->validate());
+ $instance->setPhone('');
+ self::assertFalse($instance->validate());
+ $instance->setConfirmation(new SelfEmployedRequestConfirmationRedirect());
+ self::assertFalse($instance->validate());
+
+ $instance->setItn('529834813422');
+ self::assertTrue($instance->validate());
+ }
+
+ public function testBuilder()
+ {
+ $builder = SelfEmployedRequest::builder();
+ self::assertTrue($builder instanceof SelfEmployedRequestBuilder);
+ }
+
+ public function validDataProvider()
+ {
+ $factory = new SelfEmployedRequestConfirmationFactory();
+ $result = array(
+ array(
+ array(
+ 'itn' => Random::str(12, 12, '0123456789'),
+ 'phone' => Random::str(11, 11, '0123456789'),
+ 'confirmation' => null,
+ ),
+ ),
+ array(
+ array(
+ 'itn' => Random::str(12, 12, '0123456789'),
+ 'phone' => Random::str(11, 11, '0123456789'),
+ 'confirmation' => '',
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $request = array(
+ 'itn' => Random::str(12, 12, '0123456789'),
+ 'phone' => Random::str(11, 11, '0123456789'),
+ 'confirmation' => $factory->factoryFromArray(array('type' => Random::value(SelfEmployedConfirmationType::getValidValues()))),
+ );
+ $result[] = array($request);
+ }
+ return $result;
+ }
+
+ public function invalidItnDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ );
+ }
+
+ public function invalidPhoneDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ );
+ }
+
+ public function invalidConfirmationDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ array(new \stdClass()),
+ array(Random::str(10)),
+ );
+ }
+}
diff --git a/tests/Request/SelfEmployed/SelfEmployedResponseTest.php b/tests/Request/SelfEmployed/SelfEmployedResponseTest.php
new file mode 100644
index 00000000..a37c47da
--- /dev/null
+++ b/tests/Request/SelfEmployed/SelfEmployedResponseTest.php
@@ -0,0 +1,424 @@
+getId());
+ self::assertNull($instance->id);
+
+ $instance->setId($options['id']);
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+
+ $instance = new SelfEmployedResponse();
+ $instance->id = $options['id'];
+ self::assertEquals($options['id'], $instance->getId());
+ self::assertEquals($options['id'], $instance->id);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidId($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setId($value['id']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidId($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->id = $value['id'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetStatus($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getStatus());
+ self::assertNull($instance->status);
+
+ $instance->setStatus($options['status']);
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+
+ $instance = new SelfEmployedResponse();
+ $instance->status = $options['status'];
+ self::assertEquals($options['status'], $instance->getStatus());
+ self::assertEquals($options['status'], $instance->status);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidStatus($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setStatus($value['status']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidStatus($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->status = $value['status'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetTest($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getTest());
+ self::assertNull($instance->test);
+
+ $instance->setTest($options['test']);
+ self::assertSame($options['test'], $instance->getTest());
+ self::assertSame($options['test'], $instance->test);
+
+ $instance = new SelfEmployedResponse();
+ $instance->test = $options['test'];
+ self::assertSame($options['test'], $instance->getTest());
+ self::assertSame($options['test'], $instance->test);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidTest($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setTest($value['test']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidTest($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->test = $value['test'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetPhone($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getPhone());
+ self::assertNull($instance->phone);
+
+ $instance->setPhone($options['phone']);
+ self::assertSame($options['phone'], $instance->getPhone());
+ self::assertSame($options['phone'], $instance->phone);
+
+ $instance = new SelfEmployedResponse();
+ $instance->phone = $options['phone'];
+ self::assertSame($options['phone'], $instance->getPhone());
+ self::assertSame($options['phone'], $instance->phone);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidPhone($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setPhone($value['phone']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidPhone($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->phone = $value['phone'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetItn($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getItn());
+ self::assertNull($instance->itn);
+
+ $instance->setItn($options['itn']);
+ self::assertSame($options['itn'], $instance->getItn());
+ self::assertSame($options['itn'], $instance->itn);
+
+ $instance = new SelfEmployedResponse();
+ $instance->itn = $options['itn'];
+ self::assertSame($options['itn'], $instance->getItn());
+ self::assertSame($options['itn'], $instance->itn);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetInvalidItn($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setItn($value['itn']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @param $value
+ * @expectedException \InvalidArgumentException
+ */
+ public function testSetterInvalidItn($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->itn = $value['itn'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetCreatedAt($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getCreatedAt());
+ self::assertNull($instance->createdAt);
+ self::assertNull($instance->created_at);
+
+ $instance->setCreatedAt($options['created_at']);
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new SelfEmployedResponse();
+ $instance->createdAt = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+
+ $instance = new SelfEmployedResponse();
+ $instance->created_at = $options['created_at'];
+ self::assertSame($options['created_at'], $instance->getCreatedAt()->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->createdAt->format(YOOKASSA_DATE));
+ self::assertSame($options['created_at'], $instance->created_at->format(YOOKASSA_DATE));
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetInvalidCreatedAt($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->setCreatedAt($value['created_at']);
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreatedAt($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->createdAt = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidCreated_at($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->created_at = $value['created_at'];
+ }
+
+ /**
+ * @dataProvider validDataProvider
+ * @param array $options
+ */
+ public function testGetSetConfirmation($options)
+ {
+ $instance = new SelfEmployedResponse();
+
+ self::assertNull($instance->getConfirmation());
+ self::assertNull($instance->confirmation);
+
+ $instance->setConfirmation($options['confirmation']);
+ if (is_array($options['confirmation'])) {
+ self::assertSame($options['confirmation'], $instance->getConfirmation()->toArray());
+ self::assertSame($options['confirmation'], $instance->confirmation->toArray());
+ } else {
+ self::assertSame($options['confirmation'], $instance->getConfirmation());
+ self::assertSame($options['confirmation'], $instance->confirmation);
+ }
+
+ $instance = new SelfEmployedResponse();
+ $instance->confirmation = $options['confirmation'];
+ if (is_array($options['confirmation'])) {
+ self::assertSame($options['confirmation'], $instance->getConfirmation()->toArray());
+ self::assertSame($options['confirmation'], $instance->confirmation->toArray());
+ } else {
+ self::assertSame($options['confirmation'], $instance->getConfirmation());
+ self::assertSame($options['confirmation'], $instance->confirmation);
+ }
+ }
+
+ /**
+ * @dataProvider invalidDataProvider
+ * @expectedException \InvalidArgumentException
+ * @param $value
+ */
+ public function testSetterInvalidConfirmation($value)
+ {
+ $instance = new SelfEmployedResponse();
+ $instance->confirmation = $value['confirmation'];
+ }
+
+ public function validDataProvider()
+ {
+ $result = array();
+ $confirmTypes = SelfEmployedConfirmationType::getValidValues();
+ $confirmFactory = new SelfEmployedConfirmationFactory();
+
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => null,
+ 'phone' => Random::str(11, 11,'0123456789'),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(111111111, time())),
+ 'confirmation' => array('type' => Random::value($confirmTypes)),
+ )
+ );
+ $result[] = array(
+ array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => Random::str(11, 11,'0123456789'),
+ 'phone' => null,
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'confirmation' => null,
+ )
+ );
+
+ for ($i = 0; $i < 20; $i++) {
+ $payment = array(
+ 'id' => Random::str(36, 50),
+ 'status' => Random::value(SelfEmployedStatus::getValidValues()),
+ 'test' => Random::bool(),
+ 'itn' => Random::str(11, 11,'0123456789'),
+ 'phone' => Random::str(11, 11,'0123456789'),
+ 'created_at' => date(YOOKASSA_DATE, mt_rand(1, time())),
+ 'confirmation' => $confirmFactory->factory(Random::value($confirmTypes)),
+ );
+ $result[] = array($payment);
+ }
+ return $result;
+ }
+
+ public function invalidDataProvider()
+ {
+ $result = array(
+ array(
+ array(
+ 'id' => null,
+ 'test' => null,
+ 'status' => null,
+ 'itn' => new \stdClass(),
+ 'phone' => array(),
+ 'created_at' => null,
+ 'confirmation' => array('type' => null),
+ )
+ ),
+ array(
+ array(
+ 'id' => '',
+ 'test' => 'null',
+ 'status' => '',
+ 'itn' => array(),
+ 'phone' => new \stdClass(),
+ 'created_at' => array(),
+ 'confirmation' => new \stdClass(),
+ ),
+ ),
+ );
+ for ($i = 0; $i < 10; $i++) {
+ $selfEmployed = array(
+ 'id' => Random::str($i < 5 ? mt_rand(1, 35) : mt_rand(51, 64)),
+ 'test' => $i % 2 ? Random::str(10) : new \stdClass(),
+ 'status' => Random::str(1, 35),
+ 'phone' => $i % 2 ? new \stdClass() : array(),
+ 'itn' => $i % 2 ? new \stdClass() : array(),
+ 'created_at' => $i === 0 ? '23423-234-32' : -Random::int(),
+ 'confirmation' => Random::value(array(
+ array('type' => null),
+ array('type' => true),
+ array('type' => new \stdClass()),
+ array('type' => array()),
+ array('type' => 'fake'),
+ )),
+ );
+ $result[] = array($selfEmployed);
+ }
+ return $result;
+ }
+}
diff --git a/tests/Request/Webhook/WebhookListResponseTest.php b/tests/Request/Webhook/WebhookListResponseTest.php
index 6ed008bc..357c2df7 100644
--- a/tests/Request/Webhook/WebhookListResponseTest.php
+++ b/tests/Request/Webhook/WebhookListResponseTest.php
@@ -59,7 +59,7 @@ class WebhookListResponseTest extends TestCase
$return = array();
$count = Random::int(1, 10);
- for ($i=0; $i < $count; $i++) {
+ for ($i = 0; $i < $count; $i++) {
$return[] = $this->generateWebhook();
}
@@ -74,4 +74,4 @@ class WebhookListResponseTest extends TestCase
'url' => Random::str(20)
);
}
-}
\ No newline at end of file
+}