From f876297d7a4ea42a54de5fd7c27adb440c78c949 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Fri, 15 Mar 2024 13:21:42 +0100
Subject: [PATCH] feat: add Laravel 11 support (#475)

---
 .github/workflows/tests.yml | 34 ++++++++++++++++++++++++----------
 composer.json               | 12 ++++++------
 phpstan.neon                |  2 +-
 src/Models/WebauthnKey.php  |  2 +-
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7df143e..b5dd0bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,6 @@ on:
       - next-major
       - beta
       - alpha
-      - '[0-9]+.x'
   pull_request:
     types: [opened, synchronize, reopened]
   release:
@@ -17,8 +16,8 @@ on:
   workflow_dispatch:
 
 env:
-  default-php-version: '8.2'
-  default-laravel-version: '10.*'
+  default-php-version: '8.3'
+  default-laravel-version: '11.0'
   semantic-node-version: 20
 
 concurrency:
@@ -34,21 +33,36 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['8.1', '8.2', '8.3']
-        laravel-version: ['9.*', '10.*']
+        laravel-version: ['9.0', '10.0', '11.0']
         psr7: ['guzzle']
         include:
           - php-version: '8.1'
-            laravel-version: '9.*'
+            laravel-version: '9.0'
             psr7: 'nyholm'
           - php-version: '8.1'
-            laravel-version: '9.*'
+            laravel-version: '9.0'
             psr7: 'discovery'
           - php-version: '8.2'
-            laravel-version: '10.*'
+            laravel-version: '10.0'
             psr7: 'nyholm'
           - php-version: '8.2'
-            laravel-version: '10.*'
+            laravel-version: '10.0'
             psr7: 'discovery'
+          - php-version: '8.2'
+            laravel-version: '11.0'
+            psr7: 'nyholm'
+          - php-version: '8.2'
+            laravel-version: '11.0'
+            psr7: 'discovery'
+          - php-version: '8.3'
+            laravel-version: '11.0'
+            psr7: 'nyholm'
+          - php-version: '8.3'
+            laravel-version: '11.0'
+            psr7: 'discovery'
+        exclude:
+          - php-version: '8.1'
+            laravel-version: '11.0'
 
     steps:
       - name: Checkout sources
@@ -90,7 +104,7 @@ jobs:
       - name: Update dependencies with Laravel ${{ matrix.laravel-version }}
         run: |
           export COMPOSER_ROOT_VERSION=dev-main
-          composer require "illuminate/support:${{ matrix.laravel-version }}" --no-update
+          composer require "illuminate/support:^${{ matrix.laravel-version }}" --no-update
 
       - name: Use psr7 variant (nyholm)
         if: matrix.psr7 == 'nyholm'
@@ -149,7 +163,7 @@ jobs:
       - name: Download results
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{ format('results_{0}_{1}', env.default-php-version, env.default-laravel-version) }}
+          pattern: ${{ format('results_{0}_{1}*', env.default-php-version, env.default-laravel-version) }}
           path: results
           merge-multiple: true
 
diff --git a/composer.json b/composer.json
index d3792a4..1b71ebd 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "illuminate/support": "^9.0 || ^10.0",
+        "illuminate/support": "^9.0 || ^10.0 || ^11.0",
         "phpdocumentor/reflection-docblock": "^5.3",
         "psr/http-factory-implementation": "1.0",
         "symfony/property-access": "^6.4 || ^7.0",
@@ -37,17 +37,17 @@
     "require-dev": {
         "ext-sqlite3": "*",
         "guzzlehttp/psr7": "^2.1",
+        "jschaedl/composer-git-hooks": "^4.0",
+        "larastan/larastan": "^2.0",
         "laravel/legacy-factories": "^1.0",
         "laravel/pint": "^1.13",
-        "nunomaduro/larastan": "^2.0",
         "ocramius/package-versions": "^2.0",
-        "orchestra/testbench": "^7.0 || ^8.0",
+        "orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^9.5 || ^10.0",
-        "psalm/plugin-laravel": "^2.8",
-        "xheaven/composer-git-hooks": "^3.1"
+        "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0",
+        "psalm/plugin-laravel": "^2.8"
     },
     "suggest": {
         "guzzlehttp/psr7": "To provide a psr/http-factory-implementation implementation",
diff --git a/phpstan.neon b/phpstan.neon
index 4b046fe..3d9ed46 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
     - ./vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - ./vendor/phpstan/phpstan-strict-rules/rules.neon
 
diff --git a/src/Models/WebauthnKey.php b/src/Models/WebauthnKey.php
index 7b895c3..8cb54fd 100644
--- a/src/Models/WebauthnKey.php
+++ b/src/Models/WebauthnKey.php
@@ -26,7 +26,7 @@ class WebauthnKey extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<string>
+     * @var array<int,string>
      */
     protected $fillable = [
         'user_id',