[11.x] New Version

.github/workflows/code-quality.yaml

@@ -18,6 +18,30 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          extensions: bcmath
+        env:
+          runner: self-hosted
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2023.3
         env:

.github/workflows/code-style.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: bcmath
         env:
           runner: self-hosted

.github/workflows/deptrac.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: bcmath
         env:
           runner: self-hosted

.github/workflows/phpstan.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: bcmath
         env:
           runner: self-hosted

.github/workflows/phpunits.yaml

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

.github/workflows/rector.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: bcmath
         env:
           runner: self-hosted

composer.json

@@ -22,7 +22,7 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-json": "*",
     "ext-pdo": "*",
     "brick/math": "~0.10",
@@ -32,17 +32,17 @@
     "ramsey/uuid": "^4.0"
   },
   "require-dev": {
-    "brianium/paratest": "^7.2",
-    "cknow/laravel-money": "^7.1",
-    "ergebnis/phpstan-rules": "^1.0",
+    "brianium/paratest": "^7.3",
+    "cknow/laravel-money": "^7.2",
+    "ergebnis/phpstan-rules": "^2.1",
     "infection/infection": "~0.27",
     "laravel/cashier": "^15.0",
-    "nunomaduro/collision": "^7.7",
-    "nunomaduro/larastan": "^2.6",
-    "orchestra/testbench": "^8.5",
+    "nunomaduro/collision": "^7.10",
+    "nunomaduro/larastan": "^2.7",
+    "orchestra/testbench": "^8.19",
     "phpstan/phpstan": "^1.10",
-    "phpunit/phpunit": "^10.2",
-    "rector/rector": "^0.17",
+    "phpunit/phpunit": "^10.5",
+    "rector/rector": "^0.18",
     "symplify/easy-coding-standard": "^12.0"
   },
   "suggest": {

config/config.php

@@ -44,6 +44,7 @@
 use Bavix\Wallet\Services\DiscountService;
 use Bavix\Wallet\Services\EagerLoaderService;
 use Bavix\Wallet\Services\ExchangeService;
+use Bavix\Wallet\Services\FormatterService;
 use Bavix\Wallet\Services\PrepareService;
 use Bavix\Wallet\Services\PurchaseService;
 use Bavix\Wallet\Services\RegulatorService;
@@ -110,6 +111,7 @@
         'discount' => DiscountService::class,
         'eager_loader' => EagerLoaderService::class,
         'exchange' => ExchangeService::class,
+        'formatter' => FormatterService::class,
         'prepare' => PrepareService::class,
         'purchase' => PurchaseService::class,
         'tax' => TaxService::class,

database/2023_12_30_113122_extra_columns_removed.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Bavix\Wallet\Models\Transfer;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::dropColumns($this->table(), ['from_type', 'to_type']);
+    }
+
+    public function down(): void
+    {
+        Schema::table($this->table(), static function (Blueprint $table) {
+            $table->string('from_type')
+                ->after('from_id')
+            ;
+            $table->string('to_type')
+                ->after('to_id')
+            ;
+        });
+    }
+
+    private function table(): string
+    {
+        return (new Transfer())->getTable();
+    }
+};

database/2023_12_30_204610_soft_delete.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+use Bavix\Wallet\Models\Transaction;
+use Bavix\Wallet\Models\Transfer;
+use Bavix\Wallet\Models\Wallet;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::table((new Wallet())->getTable(), static function (Blueprint $table) {
+            $table->softDeletesTz();
+        });
+        Schema::table((new Transfer())->getTable(), static function (Blueprint $table) {
+            $table->softDeletesTz();
+        });
+        Schema::table((new Transaction())->getTable(), static function (Blueprint $table) {
+            $table->softDeletesTz();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table((new Wallet())->getTable(), static function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+        Schema::table((new Transfer())->getTable(), static function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+        Schema::table((new Transaction())->getTable(), static function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+};

phpstan.common.neon

@@ -1,60 +1,8 @@
 includes:
 	- vendor/nunomaduro/larastan/extension.neon
+	- vendor/ergebnis/phpstan-rules/rules.neon
 
 parameters:
     level: 9
     fileExtensions:
         - php
-
-parametersSchema:
-	ergebnis: structure([
-		allowAbstractClasses: bool()
-		classesAllowedToBeExtended: listOf(string())
-		classesNotRequiredToBeAbstractOrFinal: listOf(string())
-		interfacesImplementedByContainers: listOf(string())
-	])
-
-rules:
-	- Ergebnis\PHPStan\Rules\Closures\NoNullableReturnTypeDeclarationRule
-	- Ergebnis\PHPStan\Rules\Closures\NoParameterWithNullableTypeDeclarationRule
-	- Ergebnis\PHPStan\Rules\Expressions\NoCompactRule
-	- Ergebnis\PHPStan\Rules\Expressions\NoEmptyRule
-	- Ergebnis\PHPStan\Rules\Expressions\NoErrorSuppressionRule
-	- Ergebnis\PHPStan\Rules\Expressions\NoEvalRule
-	- Ergebnis\PHPStan\Rules\Expressions\NoIssetRule
-	- Ergebnis\PHPStan\Rules\Files\DeclareStrictTypesRule
-	- Ergebnis\PHPStan\Rules\Functions\NoNullableReturnTypeDeclarationRule
-	- Ergebnis\PHPStan\Rules\Functions\NoParameterWithNullableTypeDeclarationRule
-	- Ergebnis\PHPStan\Rules\Functions\NoParameterWithNullDefaultValueRule
-	- Ergebnis\PHPStan\Rules\Methods\FinalInAbstractClassRule
-	- Ergebnis\PHPStan\Rules\Methods\NoConstructorParameterWithDefaultValueRule
-	- Ergebnis\PHPStan\Rules\Methods\PrivateInFinalClassRule
-	- Ergebnis\PHPStan\Rules\Statements\NoSwitchRule
-
-services:
-	-
-		class: Ergebnis\PHPStan\Rules\Classes\FinalRule
-		arguments:
-			allowAbstractClasses: %ergebnis.allowAbstractClasses%
-			classesNotRequiredToBeAbstractOrFinal: %ergebnis.classesNotRequiredToBeAbstractOrFinal%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: Ergebnis\PHPStan\Rules\Classes\NoExtendsRule
-		arguments:
-			classesAllowedToBeExtended: %ergebnis.classesAllowedToBeExtended%
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: Ergebnis\PHPStan\Rules\Classes\PHPUnit\Framework\TestCaseWithSuffixRule
-		tags:
-			- phpstan.rules.rule
-
-	-
-		class: Ergebnis\PHPStan\Rules\Methods\NoParameterWithContainerTypeDeclarationRule
-		arguments:
-			interfacesImplementedByContainers: %ergebnis.interfacesImplementedByContainers%
-		tags:
-			- phpstan.rules.rule

phpstan.src.baseline.neon

@@ -21,12 +21,12 @@ parameters:
 			path: src/Internal/Assembler/TransactionDtoAssembler.php
 
 		-
-			message: "#^Parameter \\#6 \\$fromId of class Bavix\\\\Wallet\\\\Internal\\\\Dto\\\\TransferDto constructor expects int\\|string, mixed given\\.$#"
+			message: "#^Parameter \\#5 \\$fromId of class Bavix\\\\Wallet\\\\Internal\\\\Dto\\\\TransferDto constructor expects int\\|string, mixed given\\.$#"
 			count: 1
 			path: src/Internal/Assembler/TransferDtoAssembler.php
 
 		-
-			message: "#^Parameter \\#8 \\$toId of class Bavix\\\\Wallet\\\\Internal\\\\Dto\\\\TransferDto constructor expects int\\|string, mixed given\\.$#"
+			message: "#^Parameter \\#6 \\$toId of class Bavix\\\\Wallet\\\\Internal\\\\Dto\\\\TransferDto constructor expects int\\|string, mixed given\\.$#"
 			count: 1
 			path: src/Internal/Assembler/TransferDtoAssembler.php
 
@@ -61,18 +61,18 @@ parameters:
 			path: src/Models/Transfer.php
 
 		-
-			message: "#^Cannot cast mixed to string\\.$#"
-			count: 1
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphOne\\:\\:withTrashed\\(\\)\\.$#"
+			count: 2
 			path: src/Models/Wallet.php
 
 		-
-			message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Wallet\\:\\:getAvailableBalanceAttribute\\(\\) should return float\\|int\\|string but returns mixed\\.$#"
+			message: "#^Cannot cast mixed to string\\.$#"
 			count: 1
 			path: src/Models/Wallet.php
 
 		-
-			message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Wallet\\:\\:wallet\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphOne\\<Bavix\\\\Wallet\\\\Models\\\\Wallet\\> but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphOne\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\.$#"
-			count: 2
+			message: "#^Method Bavix\\\\Wallet\\\\Models\\\\Wallet\\:\\:getAvailableBalanceAttribute\\(\\) should return float\\|int\\|string but returns mixed\\.$#"
+			count: 1
 			path: src/Models/Wallet.php
 
 		-

phpstan.src.neon

@@ -7,24 +7,32 @@ parameters:
     fileExtensions:
         - php
     ergebnis:
-        allowAbstractClasses: true
-        classesAllowedToBeExtended:
-            # laravel
-            - Illuminate\Support\ServiceProvider
-            - Illuminate\Database\Eloquent\Model
+        noParameterWithNullableTypeDeclaration:
+            enabled: false
+        noNullableReturnTypeDeclaration:
+            enabled: false
+        noParameterWithNullDefaultValue:
+            enabled: false
+        final:
+            allowAbstractClasses: true
+            classesNotRequiredToBeAbstractOrFinal:
+                - Bavix\Wallet\Models\Wallet
+                - Bavix\Wallet\Models\Transfer
+                - Bavix\Wallet\Models\Transaction
+        noExtends:
+            classesAllowedToBeExtended:
+                # laravel
+                - Illuminate\Support\ServiceProvider
+                - Illuminate\Database\Eloquent\Model
 
-            # php exceptions
-            - LogicException
-            - RuntimeException
-            - UnderflowException
-            - UnexpectedValueException
-            - InvalidArgumentException
-
-        classesNotRequiredToBeAbstractOrFinal:
-            - Bavix\Wallet\Models\Wallet
-            - Bavix\Wallet\Models\Transfer
-            - Bavix\Wallet\Models\Transaction
-        interfacesImplementedByContainers:
-            - Psr\Container\ContainerInterface
+                # php exceptions
+                - LogicException
+                - RuntimeException
+                - UnderflowException
+                - UnexpectedValueException
+                - InvalidArgumentException
+        noParameterWithContainerTypeDeclaration:
+            interfacesImplementedByContainers:
+                - Psr\Container\ContainerInterface
     paths:
         - src/

phpstan.tests.baseline.neon

@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Method Bavix\\\\Wallet\\\\Test\\\\Infra\\\\Models\\\\Item\\:\\:boughtGoods\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphMany\\<Bavix\\\\Wallet\\\\Models\\\\Transfer\\> but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphMany\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\.$#"
+			message: "#^Method Bavix\\\\Wallet\\\\Test\\\\Infra\\\\Models\\\\Item\\:\\:boughtGoods\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\HasMany\\<Bavix\\\\Wallet\\\\Models\\\\Transfer\\> but returns Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\HasMany\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\.$#"
 			count: 1
 			path: tests/Infra/Models/Item.php