Merge pull request #63 from laravel-shift/l12-compatibility

Laravel 12.x Compatibility

Author: Sammyjo20

.github/workflows/tests.yml

@@ -3,9 +3,9 @@ name: tests
 on:
   push:
     branches:
-      - 'v1'
-      - 'v2'
-      - 'v3'
+      - v1
+      - v2
+      - v3
   pull_request:
     branches:
       - '*'
@@ -20,18 +20,22 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.2, 8.3]
-        laravel: ['10.*', '11.*']
-        stability: [prefer-lowest, prefer-stable]
+        os: [ ubuntu-latest, windows-latest ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ '10.*', '11.*', '12.*' ]
+        stability: [ prefer-lowest, prefer-stable ]
         include:
           - laravel: 10.*
             testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 11.*
             php: 8.1
+          - laravel: 12.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -20,16 +20,16 @@
     "homepage": "https://github.com/saloonphp/laravel-plugin",
     "require": {
         "php": "^8.1",
-        "illuminate/console": "^10.0 || ^11.0",
-        "illuminate/support": "^10.0 || ^11.0",
+        "illuminate/console": "^10.0 || ^11.0 || ^12.0",
+        "illuminate/support": "^10.0 || ^11.0 || ^12.0",
         "saloonphp/saloon": "^3.5",
         "symfony/finder": "^6.4 || ^7.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.48",
-        "orchestra/testbench": "^8.21 || ^9.0",
-        "pestphp/pest": "^2.32",
-        "phpstan/phpstan": "^1.10.56"
+        "orchestra/testbench": "^8.21 || ^9.0 || ^10.0",
+        "pestphp/pest": "^2.32 || ^3.7",
+        "phpstan/phpstan": "^1.10.56 || ^2.1"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,

phpstan.baseline.neon

@@ -1,6 +1,13 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^PHPDoc tag \\@mixin contains invalid type Saloon\\\\Laravel\\\\Traits\\\\HasDeprecatedFacadeMethods.$#"
+			message: '#^PHPDoc tag @mixin contains invalid type Saloon\\Laravel\\Traits\\HasDeprecatedFacadeMethods\.$#'
+			identifier: mixin.trait
 			count: 1
 			path: src/Facades/Saloon.php
+
+		-
+			message: '#^Trait Saloon\\Laravel\\Traits\\HasDeprecatedFacadeMethods is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: src/Traits/HasDeprecatedFacadeMethods.php

phpstan.dist.neon

@@ -12,7 +12,6 @@ parameters:
   #editorUrl: 'vscode://file/%%file%%:%%line%%'
 
   level: 7
-  checkGenericClassInNonGenericObjectType: false
 
   paths:
   - src

src/Casts/EncryptedOAuthAuthenticatorCast.php

@@ -8,6 +8,9 @@
 use Saloon\Contracts\OAuthAuthenticator;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
+/**
+ * @implements CastsAttributes<OAuthAuthenticator|null, OAuthAuthenticator|string|null>
+ */
 class EncryptedOAuthAuthenticatorCast implements CastsAttributes
 {
     /**

src/Casts/OAuthAuthenticatorCast.php

@@ -8,6 +8,9 @@
 use Saloon\Contracts\OAuthAuthenticator;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 
+/**
+ * @implements CastsAttributes<OAuthAuthenticator|null, OAuthAuthenticator|string|null>
+ */
 class OAuthAuthenticatorCast implements CastsAttributes
 {
     /**

src/Facades/Saloon.php

@@ -12,7 +12,7 @@
  *
  * @mixin \Saloon\Laravel\Traits\HasDeprecatedFacadeMethods
  *
- * @method static MockClient fake(array $responses) Alias of MockClient::global()
+ * @method static MockClient fake(array<mixed> $responses) Alias of MockClient::global()
  * @method static MockClient mockClient() Alias of MockClient::global()
  * @method static void assertSent(string|callable $value)
  * @method static void assertNotSent(string|callable $value)