Merge pull request #879 from bavix/l11

[11.x] raise the minimum version of laravel to 11

composer.json

@@ -12,7 +12,8 @@
     "wallet",
     "payments"
   ],
-  "minimum-stability": "stable",
+  "minimum-stability": "dev",
+  "prefer-stable" : true,
   "homepage": "https://bavix.github.io/laravel-wallet/",
   "license": "MIT",
   "authors": [
@@ -26,26 +27,26 @@
     "ext-json": "*",
     "ext-pdo": "*",
     "brick/math": "~0.10",
-    "doctrine/dbal": "^3.5",
-    "illuminate/contracts": "^10.0",
-    "illuminate/database": "^10.0",
+    "illuminate/contracts": "^11.0",
+    "illuminate/database": "^11.0",
     "ramsey/uuid": "^4.0"
   },
   "require-dev": {
-    "brianium/paratest": "^7.3",
+    "brianium/paratest": "^7.4",
     "ergebnis/phpstan-rules": "^2.1",
     "infection/infection": "~0.27",
     "laravel/cashier": "^15.0",
-    "nunomaduro/collision": "^7.10",
-    "nunomaduro/larastan": "^2.7",
-    "orchestra/testbench": "^8.19",
+    "nunomaduro/collision": "^8.0",
+    "larastan/larastan": "^2.8",
+    "orchestra/testbench": "^9.0",
     "phpstan/phpstan": "^1.10",
     "phpunit/phpunit": "^10.5",
     "rector/rector": "^0.19",
-    "symplify/easy-coding-standard": "^12.0"
+    "symplify/easy-coding-standard": "^12.1"
   },
   "suggest": {
     "bavix/laravel-wallet-swap": "Addition to the laravel-wallet library for quick setting of exchange rates",
+    "bavix/laravel-wallet-uuid": "Addition to the laravel-wallet library uuid support in laravel-wallet",
     "bavix/laravel-wallet-warmup": "Addition to the laravel-wallet library for refresh balance wallets"
   },
   "autoload": {

database/2023_12_30_113122_extra_columns_removed.php

@@ -10,6 +10,14 @@
 return new class() extends Migration {
     public function up(): void
     {
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->dropIndex(['from_type', 'from_id']);
+            $table->dropIndex(['to_type', 'to_id']);
+
+            $table->index('from_id');
+            $table->index('to_id');
+        });
+
         Schema::dropColumns($this->table(), ['from_type', 'to_type']);
     }
 

phpstan.common.neon

@@ -1,5 +1,5 @@
 includes:
-	- vendor/nunomaduro/larastan/extension.neon
+	- vendor/larastan/larastan/extension.neon
 	- vendor/ergebnis/phpstan-rules/rules.neon
 
 parameters:

phpstan.src.baseline.neon

@@ -71,7 +71,7 @@ parameters:
 			path: src/Models/Transfer.php
 
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\MorphOne\\:\\:withTrashed\\(\\)\\.$#"
+			message: "#^Cannot call method getDynamicDefaultSlug\\(\\) on class\\-string\\|object\\.$#"
 			count: 2
 			path: src/Models/Wallet.php
 
@@ -85,16 +85,6 @@ parameters:
 			count: 1
 			path: src/Models/Wallet.php
 
-		-
-			message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:hasMany\\(\\) expects string, mixed given\\.$#"
-			count: 4
-			path: src/Models/Wallet.php
-
-		-
-			message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:morphMany\\(\\) expects string, mixed given\\.$#"
-			count: 2
-			path: src/Models/Wallet.php
-
 		-
 			message: "#^Parameter \\#1 \\.\\.\\.\\$arrays of function array_merge expects array, mixed given\\.$#"
 			count: 2

phpstan.tests.baseline.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			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
-
 		-
 			message: "#^Class Bavix\\\\Wallet\\\\Test\\\\Infra\\\\TestCase is not final\\.$#"
 			count: 1
@@ -14,8 +9,3 @@ parameters:
 			message: "#^Method Bavix\\\\Wallet\\\\Test\\\\Infra\\\\TestCase\\:\\:setUp\\(\\) is not final, but since the containing class is abstract, it should be\\.$#"
 			count: 1
 			path: tests/Infra/TestCase.php
-
-		-
-			message: "#^Call to an undefined method Bavix\\\\Wallet\\\\Interfaces\\\\ProductInterface\\:\\:getWallet\\(\\)\\.$#"
-			count: 1
-			path: tests/Units/Domain/CartReceivingTest.php

phpunit.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         executionOrder="random" resolveDependencies="true"
+         bootstrap="vendor/autoload.php" backupGlobals="false"
+         colors="true" processIsolation="false" stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
+         cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
     <report>
       <clover outputFile="./build/logs/clover.xml"/>

tests/Infra/TestCase.php

@@ -48,6 +48,9 @@ final protected function getPackageProviders($app): array
         $app['config']->set('wallet.transfer.model', Transfer::class);
         $app['config']->set('wallet.wallet.model', Wallet::class);
 
+        //infra
+        $app['config']->set('database.mysql.collation', 'utf8mb4_unicode_ci');
+
         return [WalletServiceProvider::class, TestServiceProvider::class];
     }
 
@@ -67,6 +70,7 @@ final protected function getEnvironmentSetUp($app): void
         /** @var array<string, mixed> $mysql */
         $mysql = $config->get('database.connections.mysql');
         $config->set('database.connections.mariadb', array_merge($mysql, [
+            'collation' => 'utf8mb4_unicode_ci',
             'port' => 3307,
         ]));
 

tests/Units/Domain/TransactionsFilterTest.php

@@ -117,6 +117,7 @@ public function testPagination(): void
 
         $query = Transaction::with('wallet')
             ->where('payable_id', $buyer->getKey())
+            ->where('wallet_id', '=', $buyer->wallet->getKey())
             ->orderBy('created_at', 'desc')
         ;
 
@@ -154,7 +155,10 @@ public function testPagination2(): void
 
         $query = Transaction::query()
             ->where(function ($query) use ($buyer, $walletTableName, $transactionTableName) {
-                $query->where('payable_id', '=', $buyer->getKey())
+                $query
+                    ->where('payable_type', '=', $buyer->getMorphClass())
+                    ->where('payable_id', '=', $buyer->getKey())
+                    ->where('wallet_id', '=', $buyer->wallet->getKey())
                     ->join($walletTableName, $transactionTableName . '.wallet_id', '=', $walletTableName . '.id')
                     ->select($transactionTableName . '.*', $walletTableName . '.name')
                     ->get()

tests/Units/Domain/WalletTest.php

@@ -303,7 +303,7 @@ public function testDefaultWalletCustomize(): void
         self::assertSame(1, $wallet->meta['internal'] ?? 0);
     }
 
-    public function testgetDynamicDefaultSlug(): void
+    public function testGetDynamicDefaultSlug(): void
     {
         /** @var UserDynamic $user */
         $user = UserDynamicFactory::new()->create();