Skip to content

Commit

Permalink
Update components to 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
andrey-helldar committed Jul 9, 2023
1 parent 5c0e4bf commit 1b3c7e0
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 76 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
```
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion requests/.gitignore

This file was deleted.

8 changes: 0 additions & 8 deletions requests/auth.http

This file was deleted.

17 changes: 0 additions & 17 deletions requests/create.http

This file was deleted.

22 changes: 0 additions & 22 deletions requests/http-client.env.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions tests/DriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/Models/ReadyPayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/Models/RequestPayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/Models/StatusPayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions tests/Helpers/ExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Jobs/JobsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions tests/Requests/CancelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/Requests/GetQRTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Resources/DetailsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/Responses/QrCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Responses/RefundTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Responses/StatusTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit 1b3c7e0

Please sign in to comment.