Fixes after merging Laravel 12 compatibility

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: ['10.*', '11.*', '12.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
@@ -25,8 +25,9 @@ jobs:
         exclude:
           - php: 8.1
             laravel: 11.*
-          - laravel: 12.*
-            php: 8.1
+          - php: 8.1
+            laravel: 12.*
+
 
     name: Tests P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 

composer.json

@@ -26,7 +26,6 @@
         "orchestra/testbench": "^8.0|^9.0|^10.0",
         "pestphp/pest": "^v2.30.0|^3.7",
         "pestphp/pest-plugin-arch": "^2.6|^3.0",
-        "pestphp/pest-plugin-mock": "^2.0.0",
         "pestphp/pest-plugin-type-coverage": "^2.8|^3.3",
         "phpstan/phpstan": "^1.10.55|^2.1",
         "rector/rector": "^0.19|^2.0",

phpstan-baseline.neon

@@ -1,21 +1,37 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Cannot call method merge\\(\\) on mixed\\.$#"
+			message: '#^Parameter \#1 \$configuration of method TailwindMerge\\Factory\:\:withConfiguration\(\) expects array\<string, mixed\>, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/TailwindMergeServiceProvider.php
 
 		-
-			message: "#^Parameter \\#1 \\$configuration of method TailwindMerge\\\\Factory\\:\\:withConfiguration\\(\\) expects array\\<string, mixed\\>, mixed given\\.$#"
+			message: '#^Parameter \#1 \$name of method Illuminate\\View\\Compilers\\BladeCompiler\:\:directive\(\) expects string, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/TailwindMergeServiceProvider.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method Illuminate\\\\View\\\\Compilers\\\\BladeCompiler\\:\\:directive\\(\\) expects string, mixed given\\.$#"
+			message: '#^Parameter \#1 \.\.\.\$args of method TailwindMerge\\Contracts\\TailwindMergeContract\:\:merge\(\) expects array\<array\<string\>\|string\>\|string, array\<int\|string, mixed\> given\.$#'
+			identifier: argument.type
+			count: 2
+			path: src/TailwindMergeServiceProvider.php
+
+		-
+			message: '#^Parameter \#2 \.\.\.\$args of method TailwindMerge\\Contracts\\TailwindMergeContract\:\:merge\(\) expects array\<array\<string\>\|string\>\|string, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/TailwindMergeServiceProvider.php
 
 		-
-			message: "#^Cannot call method merge\\(\\) on mixed\\.$#"
+			message: '#^Cannot call method merge\(\) on mixed\.$#'
+			identifier: method.nonObject
+			count: 1
+			path: src/helpers.php
+
+		-
+			message: '#^Function twMerge\(\) should return string but returns mixed\.$#'
+			identifier: return.type
 			count: 1
 			path: src/helpers.php