From 1b3c7e05fea0a2bb32d7c326582025dd61effe56 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 10 Jul 2023 02:06:49 +0300 Subject: [PATCH] Update components to 2.x --- README.md | 2 +- composer.json | 6 +++--- requests/.gitignore | 1 - requests/auth.http | 8 -------- requests/create.http | 17 ----------------- requests/http-client.env.json | 22 ---------------------- src/Driver.php | 2 +- tests/DriverTest.php | 6 +++--- tests/Fixtures/Models/ReadyPayment.php | 2 +- tests/Fixtures/Models/RequestPayment.php | 2 +- tests/Fixtures/Models/StatusPayment.php | 2 +- tests/Helpers/ExceptionTest.php | 4 ++-- tests/Jobs/JobsTest.php | 2 +- tests/Requests/CancelTest.php | 6 +++--- tests/Requests/GetQRTest.php | 6 +++--- tests/Resources/DetailsTest.php | 2 +- tests/Responses/QrCodeTest.php | 4 ++-- tests/Responses/RefundTest.php | 2 +- tests/Responses/StatusTest.php | 2 +- tests/TestCase.php | 6 +++--- 20 files changed, 28 insertions(+), 76 deletions(-) delete mode 100644 requests/.gitignore delete mode 100644 requests/auth.http delete mode 100644 requests/create.http delete mode 100644 requests/http-client.env.json diff --git a/README.md b/README.md index 377a259..d6d107e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Or manually update `require` block of `composer.json` and run `composer update`. ```json { "require": { - "cashier-provider/sber-qr": "^1.0" + "cashier-provider/sber-qr": "^2.0" } } ``` diff --git a/composer.json b/composer.json index 902d37e..7f55167 100644 --- a/composer.json +++ b/composer.json @@ -24,13 +24,13 @@ }, "require": { "php": "^7.3|^8.0", - "cashier-provider/core": "^1.29", - "cashier-provider/sber-auth": "^1.1", + "cashier-provider/core": "^2.0", + "cashier-provider/sber-auth": "^2.0", "psr/http-message": "^1.0" }, "require-dev": { "ext-json": "*", - "andrey-helldar/support": "^4.1", + "dragon-code/support": "^5.0", "illuminate/database": "^6.0|^7.0|^8.0", "orchestra/testbench": "^4.0|^5.0|^6.0", "phpunit/phpunit": "^9.0", diff --git a/requests/.gitignore b/requests/.gitignore deleted file mode 100644 index 95914b9..0000000 --- a/requests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -http-client.private.env.json diff --git a/requests/auth.http b/requests/auth.http deleted file mode 100644 index 5bce74d..0000000 --- a/requests/auth.http +++ /dev/null @@ -1,8 +0,0 @@ -POST {{host}}/ru/prod/tokens/v2/oauth -Accept: application/json -Content-Type: application/x-www-form-urlencoded -X-IBM-Client-Id: {{client_id}} -RqUID: {{unique_id}} -Authorization: Basic {{client_hash}} - -grant_type=client_credentials&scope=https://api.sberbank.ru/order.create diff --git a/requests/create.http b/requests/create.http deleted file mode 100644 index a6e75ea..0000000 --- a/requests/create.http +++ /dev/null @@ -1,17 +0,0 @@ -POST {{host}}/ru/prod/tokens/v2/oauth -Accept: application/json -Content-Type: application/json -X-IBM-Client-Id: {{client_id}} -RqUID: {{unique_id}} -Authorization: Bearer {{access_token}} - -{ - "rq_uid": "{{unique_id}}", - "rq_tm": "2021-08-23T17:59:00Z", - "member_id": "{{member_id}}", - "id_qr": "{{terminal_id}}", - "order_number": "1234", - "order_sum": 100, - "order_create_date": "2021-08-23T17:59:00Z", - "currency": "643" -} diff --git a/requests/http-client.env.json b/requests/http-client.env.json deleted file mode 100644 index 4295ad7..0000000 --- a/requests/http-client.env.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dev": { - "host": "https://dev.api.sberbank.ru", - "client_id": "", - "client_secret": "", - "client_hash": "", - "member_id": "", - "terminal_id": "", - "unique_id": "", - "access_token": "" - }, - "production": { - "host": "https://api.sberbank.ru", - "client_id": "", - "client_secret": "", - "client_hash": "", - "member_id": "", - "terminal_id": "", - "unique_id": "", - "access_token": "" - } -} diff --git a/src/Driver.php b/src/Driver.php index 6ffbc0c..b18c8e3 100644 --- a/src/Driver.php +++ b/src/Driver.php @@ -27,7 +27,7 @@ use CashierProvider\Sber\QrCode\Responses\Cancel as CancelResponse; use CashierProvider\Sber\QrCode\Responses\QrCode; use CashierProvider\Sber\QrCode\Responses\Status as StatusResponse; -use Helldar\Contracts\Cashier\Http\Response; +use DragonCode\Contracts\Cashier\Http\Response; class Driver extends BaseDriver { diff --git a/tests/DriverTest.php b/tests/DriverTest.php index 0f92b90..5048068 100644 --- a/tests/DriverTest.php +++ b/tests/DriverTest.php @@ -20,9 +20,9 @@ use CashierProvider\Core\Http\Response; use CashierProvider\Core\Services\Jobs; use CashierProvider\Sber\QrCode\Driver as QR; -use Helldar\Contracts\Cashier\Driver as DriverContract; -use Helldar\Contracts\Cashier\Http\Response as ResponseContract; -use Helldar\Support\Facades\Http\Url; +use DragonCode\Contracts\Cashier\Driver as DriverContract; +use DragonCode\Contracts\Cashier\Http\Response as ResponseContract; +use DragonCode\Support\Facades\Http\Url; use Illuminate\Database\Eloquent\Model; use Tests\Fixtures\Models\RequestPayment; diff --git a/tests/Fixtures/Models/ReadyPayment.php b/tests/Fixtures/Models/ReadyPayment.php index afd6670..aa37a6d 100644 --- a/tests/Fixtures/Models/ReadyPayment.php +++ b/tests/Fixtures/Models/ReadyPayment.php @@ -20,7 +20,7 @@ namespace Tests\Fixtures\Models; use CashierProvider\Core\Concerns\Casheable; -use Helldar\LaravelSupport\Eloquent\UuidModel; +use DragonCode\LaravelSupport\Eloquent\UuidModel; use Illuminate\Support\Carbon; use Tests\TestCase; diff --git a/tests/Fixtures/Models/RequestPayment.php b/tests/Fixtures/Models/RequestPayment.php index 22c0d99..789c4da 100644 --- a/tests/Fixtures/Models/RequestPayment.php +++ b/tests/Fixtures/Models/RequestPayment.php @@ -17,7 +17,7 @@ namespace Tests\Fixtures\Models; use CashierProvider\Core\Concerns\Casheable; -use Helldar\LaravelSupport\Eloquent\UuidModel; +use DragonCode\LaravelSupport\Eloquent\UuidModel; /** * @property \Illuminate\Support\Carbon $created_at diff --git a/tests/Fixtures/Models/StatusPayment.php b/tests/Fixtures/Models/StatusPayment.php index cd6d117..231d954 100644 --- a/tests/Fixtures/Models/StatusPayment.php +++ b/tests/Fixtures/Models/StatusPayment.php @@ -18,7 +18,7 @@ namespace Tests\Fixtures\Models; use CashierProvider\Core\Concerns\Casheable; -use Helldar\LaravelSupport\Eloquent\UuidModel; +use DragonCode\LaravelSupport\Eloquent\UuidModel; use Illuminate\Support\Carbon; use Tests\TestCase; diff --git a/tests/Helpers/ExceptionTest.php b/tests/Helpers/ExceptionTest.php index 6001805..d96c876 100644 --- a/tests/Helpers/ExceptionTest.php +++ b/tests/Helpers/ExceptionTest.php @@ -21,8 +21,8 @@ use CashierProvider\Core\Exceptions\Http\BankInternalErrorException; use CashierProvider\Core\Exceptions\Http\BaseException; use CashierProvider\Sber\QrCode\Exceptions\Manager; -use Helldar\Contracts\Http\Builder as HttpBuilder; -use Helldar\Support\Facades\Http\Builder; +use DragonCode\Contracts\Http\Builder as HttpBuilder; +use DragonCode\Support\Facades\Http\Builder; use Tests\TestCase; class ExceptionTest extends TestCase diff --git a/tests/Jobs/JobsTest.php b/tests/Jobs/JobsTest.php index 822faf1..4fd3776 100644 --- a/tests/Jobs/JobsTest.php +++ b/tests/Jobs/JobsTest.php @@ -19,7 +19,7 @@ use CashierProvider\Core\Constants\Status; use CashierProvider\Core\Facades\Config\Payment as PaymentConfig; use CashierProvider\Core\Services\Jobs; -use Helldar\Support\Facades\Http\Url; +use DragonCode\Support\Facades\Http\Url; use Illuminate\Support\Facades\DB; use Tests\Fixtures\Models\RequestPayment; use Tests\TestCase; diff --git a/tests/Requests/CancelTest.php b/tests/Requests/CancelTest.php index 7fe4250..61b0902 100644 --- a/tests/Requests/CancelTest.php +++ b/tests/Requests/CancelTest.php @@ -20,9 +20,9 @@ use CashierProvider\Core\Http\Request; use CashierProvider\Sber\QrCode\Constants\Body; use CashierProvider\Sber\QrCode\Requests\Cancel; -use Helldar\Contracts\Cashier\Http\Request as RequestContract; -use Helldar\Contracts\Http\Builder; -use Helldar\Support\Facades\Helpers\Arr; +use DragonCode\Contracts\Cashier\Http\Request as RequestContract; +use DragonCode\Contracts\Http\Builder; +use DragonCode\Support\Facades\Helpers\Arr; use Tests\TestCase; class CancelTest extends TestCase diff --git a/tests/Requests/GetQRTest.php b/tests/Requests/GetQRTest.php index 5f5ea57..a774245 100644 --- a/tests/Requests/GetQRTest.php +++ b/tests/Requests/GetQRTest.php @@ -20,9 +20,9 @@ use CashierProvider\Core\Http\Request; use CashierProvider\Sber\QrCode\Constants\Body; use CashierProvider\Sber\QrCode\Requests\Create; -use Helldar\Contracts\Cashier\Http\Request as RequestContract; -use Helldar\Contracts\Http\Builder; -use Helldar\Support\Facades\Helpers\Arr; +use DragonCode\Contracts\Cashier\Http\Request as RequestContract; +use DragonCode\Contracts\Http\Builder; +use DragonCode\Support\Facades\Helpers\Arr; use Tests\TestCase; class GetQRTest extends TestCase diff --git a/tests/Resources/DetailsTest.php b/tests/Resources/DetailsTest.php index 9a34ba8..9e3cb43 100644 --- a/tests/Resources/DetailsTest.php +++ b/tests/Resources/DetailsTest.php @@ -19,7 +19,7 @@ use CashierProvider\Core\Resources\Details as BaseDetails; use CashierProvider\Sber\QrCode\Resources\Details; -use Helldar\Contracts\Cashier\Resources\Details as DetailsContract; +use DragonCode\Contracts\Cashier\Resources\Details as DetailsContract; use Tests\TestCase; class DetailsTest extends TestCase diff --git a/tests/Responses/QrCodeTest.php b/tests/Responses/QrCodeTest.php index b0d3eff..e414876 100644 --- a/tests/Responses/QrCodeTest.php +++ b/tests/Responses/QrCodeTest.php @@ -18,7 +18,7 @@ namespace Tests\Responses; use CashierProvider\Sber\QrCode\Responses\QrCode; -use Helldar\Contracts\Cashier\Http\Response; +use DragonCode\Contracts\Cashier\Http\Response; use Tests\TestCase; class QrCodeTest extends TestCase @@ -63,7 +63,7 @@ public function testToArray() } /** - * @return \CashierProvider\Sber\QrCode\Responses\QrCode|\Helldar\Contracts\Cashier\Http\Response + * @return \CashierProvider\Sber\QrCode\Responses\QrCode|\DragonCode\Contracts\Cashier\Http\Response */ protected function response(): Response { diff --git a/tests/Responses/RefundTest.php b/tests/Responses/RefundTest.php index 58af030..cc1e45e 100644 --- a/tests/Responses/RefundTest.php +++ b/tests/Responses/RefundTest.php @@ -19,7 +19,7 @@ use CashierProvider\Core\Http\Response as BaseResponse; use CashierProvider\Sber\QrCode\Responses\Cancel as CancelResponse; -use Helldar\Contracts\Cashier\Http\Response; +use DragonCode\Contracts\Cashier\Http\Response; use Tests\TestCase; class RefundTest extends TestCase diff --git a/tests/Responses/StatusTest.php b/tests/Responses/StatusTest.php index c28485a..7d2281e 100644 --- a/tests/Responses/StatusTest.php +++ b/tests/Responses/StatusTest.php @@ -19,7 +19,7 @@ use CashierProvider\Core\Http\Response as BaseResponse; use CashierProvider\Sber\QrCode\Responses\Status; -use Helldar\Contracts\Cashier\Http\Response; +use DragonCode\Contracts\Cashier\Http\Response; use Tests\TestCase; class StatusTest extends TestCase diff --git a/tests/TestCase.php b/tests/TestCase.php index cb847b3..fb40856 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,8 +22,8 @@ use CashierProvider\Core\Facades\Config\Payment as PaymentConfig; use CashierProvider\Core\Models\CashierDetail; use CashierProvider\Sber\QrCode\Driver; -use Helldar\Contracts\Cashier\Http\Request; -use Helldar\Contracts\Cashier\Resources\Details; +use DragonCode\Contracts\Cashier\Http\Request; +use DragonCode\Contracts\Cashier\Resources\Details; use Illuminate\Database\Eloquent\Model as EloquentModel; use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables; use Orchestra\Testbench\TestCase as BaseTestCase; @@ -129,7 +129,7 @@ protected function detailsRelation(EloquentModel $model, ?Details $details): Cas /** * @param \CashierProvider\Sber\QrCode\Requests\BaseRequest|string $request * - * @return \Helldar\Contracts\Cashier\Http\Request + * @return \DragonCode\Contracts\Cashier\Http\Request */ protected function request(string $request): Request {