chore: Allow Laravel 12 and other improvements (#2282)

* chore: Allow Laravel 12 and other improvements

* fix

* bump mockery

* fix lowest carbon

* remove double run

Author: tymondesigns

.github/workflows/phpunit.yml

@@ -2,7 +2,6 @@ name: PHPUnit tests
 
 on:
   push:
-  pull_request:
   release:
     types:
       - published
@@ -15,23 +14,29 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.0, 8.1, 8.2, 8.3, 8.4]
-        laravel: [9.*, 10.*, 11.*]
+        laravel: [9.*, 10.*, 11.*, 12.*]
         os: [ubuntu-latest]
         coverage: [none]
+        stability: [prefer-lowest, prefer-stable]
         include:
-          - php: 8.3
-            laravel: 11.*
+          - php: 8.4
+            laravel: 12.*
             os: ubuntu-latest
             coverage: xdebug
+            stability: prefer-stable
         exclude:
           - php: 8.0
             laravel: 10.*
           - php: 8.0
             laravel: 11.*
           - php: 8.1
             laravel: 11.*
+          - php: 8.0
+            laravel: 12.*
+          - php: 8.1
+            laravel: 12.*
 
-    name: '[P${{ matrix.php }}] [L${{ matrix.laravel }}] [${{ matrix.coverage }}]'
+    name: PHP${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -53,13 +58,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: "php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}"
+          key: "php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ matrix.stability }}-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ matrix.stability }}-${{ hashFiles('**/composer.json') }}"
 
       - name: Install dependencies
         run: |
           composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-progress --no-update
-          composer update --no-progress --prefer-dist --no-interaction
+          composer update --${{ matrix.stability }} --no-progress --prefer-dist --no-interaction
 
       - name: Execute tests
         run: composer test:ci

composer.json

@@ -24,18 +24,18 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/auth": "^9.0|^10.0|^11.0",
-        "illuminate/contracts": "^9.0|^10.0|^11.0",
-        "illuminate/http": "^9.0|^10.0|^11.0",
-        "illuminate/support": "^9.0|^10.0|^11.0",
+        "illuminate/auth": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/contracts": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/http": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/support": "^9.0|^10.0|^11.0|^12.0",
         "lcobucci/jwt": "^4.0",
-        "nesbot/carbon": "^2.0|^3.0"
+        "nesbot/carbon": "^2.69|^3.0"
     },
     "require-dev": {
-        "illuminate/console": "^9.0|^10.0|^11.0",
-        "illuminate/database": "^9.0|^10.0|^11.0",
-        "illuminate/routing": "^9.0|^10.0|^11.0",
-        "mockery/mockery": ">=0.9.9",
+        "illuminate/console": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/database": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/routing": "^9.0|^10.0|^11.0|^12.0",
+        "mockery/mockery": "^1.6",
         "phpunit/phpunit": "^9.4"
     },
     "autoload": {
@@ -63,12 +63,6 @@
             ]
         }
     },
-    "funding": [
-        {
-            "type": "patreon",
-            "url": "https://www.patreon.com/seantymon"
-        }
-    ],
     "config": {
         "sort-packages": true
     },

src/Claims/Claim.php

@@ -139,7 +139,7 @@ public function matches($value, $strict = true)
      * @return array
      */
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->toArray();
     }