geckon01/yookassa-sdk-php
1
0
Fork 0
mirror of https://git.yoomoney.ru/scm/sdk/yookassa-sdk-php.git synced 2026-09-11 18:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from yoomoney/release/v2.2.0

Browse Source 
Release/2.2.0
This commit is contained in:
Anton Nikolaev
2021-11-03 17:54:24 +03:00
committed by GitHub
parent 653c82b9f2 03d7052ded
commit f0ea529875
8 changed files with 17 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -11,7 +11,7 @@
"email": "cms@yoomoney.ru"
}
],
"version": "2.1.9",
"version": "2.2.0",
"require": {
"php": ">=5.3.0",
"ext-curl": "*",
tests/Model/PayoutTest.php
+9 -8
View File
@@ -310,15 +310,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->setDeal($options['deal']);
self::assertSame($options['deal'], $instance->getDeal());
self::assertSame($options['deal'], $instance->deal);
$instance = new Payout();
$instance->deal = $options['deal'];
self::assertSame($options['deal'], $instance->getDeal());
self::assertSame($options['deal'], $instance->deal);
$instance = new Payout();
$instance->deal = $options['deal'];
self::assertSame($options['deal'], $instance->getDeal());
self::assertSame($options['deal'], $instance->deal);
}
}
/**
tests/Model/RequestorTest.php
-151
View File
@@ -1,151 +0,0 @@
<?php
namespace Tests\YooKassa\Model;
use YooKassa\Helpers\ProductCode;
use YooKassa\Helpers\Random;
use YooKassa\Model\Requestor;
use PHPUnit\Framework\TestCase;
class RequestorTest extends TestCase
{
/**
* @dataProvider validDataProvider
* @param array $value
*/
public function testSetGetType($value)
{
$instance = new Requestor();
$instance->setType($value['type']);
self::assertEquals($value['type'], $instance->getType());
}
/**
* @dataProvider invalidTypeDataProvider
* @param $value
* @expectedException \InvalidArgumentException
*/
public function testSetGetInvalidType($value)
{
$instance = new Requestor();
$instance->setType($value);
}
/**
* @dataProvider validDataProvider
* @param array $value
*/
public function testGetSetAccountId($value)
{
$instance = new Requestor();
$instance->setAccountId($value['account_id']);
self::assertEquals($value['account_id'], $instance->getAccountId());
}
/**
* @dataProvider invalidDataProvider
* @param $value
* @expectedException \InvalidArgumentException
*/
public function testGetSetInvalidAccountId($value)
{
$instance = new Requestor();
$instance->setAccountId($value);
}
/**
* @dataProvider validDataProvider
* @param array $value
*/
public function testGetSetClientId($value)
{
$instance = new Requestor();
$instance->setClientId($value['client_id']);
self::assertEquals($value['client_id'], $instance->getClientId());
}
/**
* @dataProvider invalidDataProvider
* @param $value
* @expectedException \InvalidArgumentException
*/
public function testGetSetInvalidClientId($value)
{
$instance = new Requestor();
$instance->setClientId($value);
}
/**
* @dataProvider validDataProvider
* @param array $value
*/
public function testGetSetClientName($value)
{
$instance = new Requestor();
$instance->setClientName($value['client_name']);
self::assertEquals($value['client_name'], $instance->getClientName());
}
/**
* @dataProvider invalidDataProvider
* @param $value
* @expectedException \InvalidArgumentException
*/
public function testGetSetInvalidClientName($value)
{
$instance = new Requestor();
$instance->setClientName($value);
}
/**
* @dataProvider invalidDataProvider
* @param array $options
*/
public function validDataProvider()
{
$result = array(
array(
array(
'type' => 'RequestorThirdPartyService',
'account_id' => 12345,
'client_id' => 12345,
'client_name' => 'test',
)
),
array(
array(
'type' => 'RequestorThirdPartyService',
'account_id' => null,
'client_id' => null,
'client_name' => null,
),
),
);
for ($i = 0; $i < 9; $i++) {
$request = array(
'type' => 'RequestorMarchant',
'account_id' => Random::str(1, 64, '0123456789'),
'client_id' => Random::int(100000, 999999)
);
$result[] = array($request);
}
return $result;
}
public function invalidTypeDataProvider()
{
return array(
array(null),
array(false),
array(array(new ProductCode()))
);
}
public function invalidDataProvider()
{
return array(
array(false),
array(array(new ProductCode()))
);
}
}
tests/Model/SafeDealTest.php
+3 -1
View File
@@ -7,6 +7,7 @@ use YooKassa\Helpers\Random;
use YooKassa\Model\Deal\DealBalanceAmount;
use YooKassa\Model\Deal\DealStatus;
use YooKassa\Model\Deal\DealType;
use YooKassa\Model\Deal\FeeMoment;
use YooKassa\Model\Metadata;
use YooKassa\Model\SafeDeal;
@@ -443,7 +444,7 @@ class SafeDealTest extends TestCase
public function testSetInvalidTest($value)
{
$instance = new SafeDeal();
$instance->setTest($value['paid']);
$instance->setTest($value['test']);
}
/**
@@ -502,6 +503,7 @@ class SafeDealTest extends TestCase
$payment = array(
'id' => Random::str(36),
'type' => Random::value(DealType::getValidValues()),
'fee_moment' => Random::value(FeeMoment::getValidValues()),
'status' => Random::value(DealStatus::getValidValues()),
'balance' => new DealBalanceAmount(Random::int(1, 10000), 'RUB'),
'payout_balance' => new DealBalanceAmount(Random::int(1, 10000), 'RUB'),
tests/Request/Payments/PaymentsResponseTest.php
+3
View File
@@ -101,6 +101,9 @@ class PaymentsResponseTest extends TestCase
),
'paid' => false,
'refundable' => false,
'confirmation' => array(
'type' => ConfirmationType::EXTERNAL,
),
)
),
'next_cursor' => uniqid(),
tests/Request/Receipts/AbstractReceiptResponseTest.php
+1 -1
View File
@@ -147,7 +147,7 @@ abstract class AbstractReceiptResponseTest extends TestCase
'fiscal_document_number' => Random::int(4),
'fiscal_storage_number' => Random::int(16),
'fiscal_attribute' => Random::int(10),
'registered_at' => date('Y-m-d\TH:i:s.vP', mt_rand(1111111111, time())),
'registered_at' => date(YOOKASSA_DATE, mt_rand(1111111111, time())),
'fiscal_provider_id' => Random::str(36),
'items' => $this->generateItems(),
'settlements' => $this->generateSettlements(),
tests/Request/Receipts/ReceiptsRequestBuilderTest.php
-3
View File
@@ -189,9 +189,6 @@ class ReceiptsRequestBuilderTest extends TestCase
'createdAtGte' => '2017-10-04T19:27:51.407+00:00'
)
),
array(
array()
)
);
for ($i = 0; $i < 8; $i++) {
$receipts = array(
tests/Request/Receipts/ReceiptsRequestTest.php
-3
View File
@@ -279,9 +279,6 @@ class ReceiptsRequestTest extends TestCase
'createdAtLte' => '2017-10-04T19:27:51.407+00:00',
'createdAtGte' => '2017-10-04T19:27:51.407+00:00'
)
),
array(
array()
)
);
for ($i = 0; $i < 10; $i++) {