Merge pull request #1051 from bavix/php85

Update PHP versions in GitHub Actions workflow to include 8.5

Author: rez1dent3

.github/workflows/phpunits.yaml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [8.3, 8.4]
+        php-versions: [8.3, 8.4, 8.5]
         databases: [testing, pgsql, mysql, mariadb]
         caches: [array, redis, memcached, database]
         locks: [redis, memcached]

README.md

@@ -20,7 +20,7 @@ laravel-wallet - It's easy to work with a virtual wallet.
 
 | Version    | Laravel        | PHP             | Release date | End of improvements | End of support |
 |------------|----------------|-----------------|--------------|---------------------|----------------|
-| 11.x [LTS] | ^11.0, ^12.0   | 8.2,8.3,8.4     | Mar 14, 2024 | May 1, 2026         | Sep 6, 2026    |
+| 11.x [LTS] | ^11.0, ^12.0   | 8.3,8.4,8.5     | Mar 14, 2024 | May 1, 2026         | Sep 6, 2026    |
 
 ### Upgrade Guide
 

composer.json

@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-json": "*",
         "ext-pdo": "*",
         "brick/math": "~0.10",
@@ -41,7 +41,7 @@
         "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^11.0",
         "rector/rector": "^2.0",
-        "symplify/easy-coding-standard": "^12.1"
+        "symplify/easy-coding-standard": "^13.0"
     },
     "suggest": {
         "bavix/laravel-wallet-swap": "Addition to the laravel-wallet library for quick setting of exchange rates",

rector.php

@@ -29,5 +29,5 @@
     $config->import(SetList::INSTANCEOF);
     $config->import(SetList::CODE_QUALITY);
     $config->import(SetList::DEAD_CODE);
-    $config->import(SetList::PHP_82);
+    $config->import(SetList::PHP_83);
 };

src/Internal/Assembler/ExtraDtoAssembler.php

@@ -22,6 +22,6 @@ public function create(ExtraDtoInterface|array|null $data): ExtraDtoInterface
 
         $option = $this->optionDtoAssembler->create($data);
 
-        return new Extra($option, $option, null);
+        return new Extra($option, $option);
     }
 }

src/Internal/Service/LockService.php

@@ -10,9 +10,9 @@
 
 final class LockService implements LockServiceInterface
 {
-    private const LOCK_KEY = 'wallet_lock::';
+    private const string LOCK_KEY = 'wallet_lock::';
 
-    private const INNER_KEYS = 'inner_keys::';
+    private const string INNER_KEYS = 'inner_keys::';
 
     private ?LockProvider $lockProvider = null;
 

src/Internal/Service/StateService.php

@@ -9,27 +9,27 @@
 
 final readonly class StateService implements StateServiceInterface
 {
-    private const RANDOM_BYTES = 3;
+    private const int RANDOM_BYTES = 3;
 
     /**
      * Keeps the state of balance
      */
-    private const PREFIX_STATE = 'wallet_s::';
+    private const string PREFIX_STATE = 'wallet_s::';
 
     /**
      * Stores a callback reference
      */
-    private const PREFIX_FORK_REF = 'wallet_f::';
+    private const string PREFIX_FORK_REF = 'wallet_f::';
 
     /**
      * Stores a pair of uuid with forkId
      */
-    private const PREFIX_FORK_ID = 'wallet_fc::';
+    private const string PREFIX_FORK_ID = 'wallet_fc::';
 
     /**
      * Stores all uuids for a particular forkId
      */
-    private const PREFIX_HASHMAP = 'wallet_hm::';
+    private const string PREFIX_HASHMAP = 'wallet_hm::';
 
     private CacheRepository $store;
 

src/Internal/Service/StorageService.php

@@ -10,7 +10,7 @@
 
 final readonly class StorageService implements StorageServiceInterface
 {
-    private const PREFIX = 'wallet_sg::';
+    private const string PREFIX = 'wallet_sg::';
 
     public function __construct(
         private MathServiceInterface $mathService,

src/Models/Transaction.php

@@ -41,9 +41,9 @@ class Transaction extends Model
 {
     use SoftDeletes;
 
-    final public const TYPE_DEPOSIT = 'deposit';
+    final public const string TYPE_DEPOSIT = 'deposit';
 
-    final public const TYPE_WITHDRAW = 'withdraw';
+    final public const string TYPE_WITHDRAW = 'withdraw';
 
     /**
      * @var array<int, string>
@@ -73,6 +73,7 @@ public function casts(): array
         ];
     }
 
+    #[\Override]
     public function getTable(): string
     {
         if ((string) $this->table === '') {
@@ -125,6 +126,7 @@ public function setAmountFloatAttribute(float|int|string $amount): void
         $this->amount = $math->round($math->mul($amount, $decimalPlaces));
     }
 
+    #[\Override]
     protected static function boot(): void
     {
         parent::boot();

src/Models/Transfer.php

@@ -38,15 +38,15 @@ class Transfer extends Model
 {
     use SoftDeletes;
 
-    final public const STATUS_EXCHANGE = 'exchange';
+    final public const string STATUS_EXCHANGE = 'exchange';
 
-    final public const STATUS_TRANSFER = 'transfer';
+    final public const string STATUS_TRANSFER = 'transfer';
 
-    final public const STATUS_PAID = 'paid';
+    final public const string STATUS_PAID = 'paid';
 
-    final public const STATUS_REFUND = 'refund';
+    final public const string STATUS_REFUND = 'refund';
 
-    final public const STATUS_GIFT = 'gift';
+    final public const string STATUS_GIFT = 'gift';
 
     /**
      * @var array<int, string>
@@ -77,6 +77,7 @@ public function casts(): array
         ];
     }
 
+    #[\Override]
     public function getTable(): string
     {
         if ((string) $this->table === '') {
@@ -118,6 +119,7 @@ public function withdraw(): BelongsTo
         return $this->belongsTo(config('wallet.transaction.model', Transaction::class), 'withdraw_id');
     }
 
+    #[\Override]
     protected static function boot(): void
     {
         parent::boot();