From 7989cbc8cb56e577566b307695d48f3a50c48ff8 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Tue, 16 Jul 2024 19:13:56 +0300 Subject: [PATCH 1/2] phpstan update baseline --- phpstan.src.baseline.neon | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/phpstan.src.baseline.neon b/phpstan.src.baseline.neon index 01fda8951..349091a29 100644 --- a/phpstan.src.baseline.neon +++ b/phpstan.src.baseline.neon @@ -51,7 +51,12 @@ parameters: path: src/Internal/Service/StateService.php - - message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\) expects string, mixed given\\.$#" + message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Transaction\\:\\:wallet\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\ but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\\\.$#" + count: 1 + path: src/Models/Transaction.php + + - + message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\) expects class\\-string\\, mixed given\\.$#" count: 1 path: src/Models/Transaction.php @@ -61,7 +66,32 @@ parameters: path: src/Models/Transaction.php - - message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\) expects string, mixed given\\.$#" + message: "#^Unable to resolve the template type TRelatedModel in call to method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\)$#" + count: 1 + path: src/Models/Transaction.php + + - + message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Transfer\\:\\:deposit\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\ but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\\\.$#" + count: 1 + path: src/Models/Transfer.php + + - + message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Transfer\\:\\:from\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\ but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\\\.$#" + count: 1 + path: src/Models/Transfer.php + + - + message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Transfer\\:\\:to\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\ but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\\\.$#" + count: 1 + path: src/Models/Transfer.php + + - + message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Transfer\\:\\:withdraw\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\ but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo\\\\.$#" + count: 1 + path: src/Models/Transfer.php + + - + message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\) expects class\\-string\\, mixed given\\.$#" count: 4 path: src/Models/Transfer.php @@ -70,6 +100,11 @@ parameters: count: 1 path: src/Models/Transfer.php + - + message: "#^Unable to resolve the template type TRelatedModel in call to method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\)$#" + count: 4 + path: src/Models/Transfer.php + - message: "#^Cannot call method getDynamicDefaultSlug\\(\\) on class\\-string\\|object\\.$#" count: 2 From 6503f34f91ab081aa3fab7c17cfaf230b44de80c Mon Sep 17 00:00:00 2001 From: Github bot Date: Tue, 16 Jul 2024 16:17:43 +0000 Subject: [PATCH 2/2] autofix --- src/External/Dto/Extra.php | 10 +++++----- src/Internal/Service/ConnectionService.php | 4 ++-- src/Internal/Service/StateService.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/External/Dto/Extra.php b/src/External/Dto/Extra.php index 2705a59e2..ca971ee5f 100644 --- a/src/External/Dto/Extra.php +++ b/src/External/Dto/Extra.php @@ -7,11 +7,11 @@ use Bavix\Wallet\External\Contracts\ExtraDtoInterface; use Bavix\Wallet\External\Contracts\OptionDtoInterface; -final class Extra implements ExtraDtoInterface +final readonly class Extra implements ExtraDtoInterface { - private readonly OptionDtoInterface $deposit; + private OptionDtoInterface $deposit; - private readonly OptionDtoInterface $withdraw; + private OptionDtoInterface $withdraw; /** * @param OptionDtoInterface|array|null $deposit @@ -21,8 +21,8 @@ final class Extra implements ExtraDtoInterface public function __construct( OptionDtoInterface|array|null $deposit, OptionDtoInterface|array|null $withdraw, - private readonly ?string $uuid = null, - private readonly ?array $extra = null + private ?string $uuid = null, + private ?array $extra = null ) { $this->deposit = $deposit instanceof OptionDtoInterface ? $deposit : new Option($deposit); $this->withdraw = $withdraw instanceof OptionDtoInterface ? $withdraw : new Option($withdraw); diff --git a/src/Internal/Service/ConnectionService.php b/src/Internal/Service/ConnectionService.php index aba5359ed..c3ef8c939 100644 --- a/src/Internal/Service/ConnectionService.php +++ b/src/Internal/Service/ConnectionService.php @@ -10,9 +10,9 @@ /** * @internal */ -final class ConnectionService implements ConnectionServiceInterface +final readonly class ConnectionService implements ConnectionServiceInterface { - private readonly ConnectionInterface $connection; + private ConnectionInterface $connection; public function __construct(ConnectionResolverInterface $connectionResolver) { diff --git a/src/Internal/Service/StateService.php b/src/Internal/Service/StateService.php index 8fcd411da..998781679 100644 --- a/src/Internal/Service/StateService.php +++ b/src/Internal/Service/StateService.php @@ -7,7 +7,7 @@ use Illuminate\Contracts\Cache\Factory as CacheFactory; use Illuminate\Contracts\Cache\Repository as CacheRepository; -final class StateService implements StateServiceInterface +final readonly class StateService implements StateServiceInterface { private const RANDOM_BYTES = 3; @@ -31,7 +31,7 @@ final class StateService implements StateServiceInterface */ private const PREFIX_HASHMAP = 'wallet_hm::'; - private readonly CacheRepository $store; + private CacheRepository $store; public function __construct(CacheFactory $cacheFactory) {