Merge pull request #56 from spatie/laravel-11

Add support for Laravel 11
eduardokum · Mar 12, 2024 · 726a7cb · 726a7cb
2 parents e41a4b6 + d26ae81
commit 726a7cb
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/.github/workflows/format_php.yml b/.github/workflows/format_php.yml
@@ -8,9 +8,10 @@ on:
 jobs:
   php-cs-fixer:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP with php-cs-fixer
         uses: shivammathur/setup-php@master

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,14 +10,17 @@ env:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.1, 8.0, 7.4, 7.3, 7.2]
-        laravel: [10.*, 9.*, 8.*, 7.*, 6.*]
+        php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3, 7.2]
+        laravel: ['11.*', '10.*', '9.*', '8.*', '7.*', '6.*']
         os: [ubuntu-latest]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
@@ -33,18 +36,24 @@ jobs:
             php: 8.1
           - laravel: 6.*
             php: 8.2
+          - laravel: 6.*
+            php: 8.3
           - laravel: 7.*
             php: 8.1
           - laravel: 7.*
             php: 8.2
+          - laravel: 7.*
+            php: 8.3
           - laravel: 8.*
             php: 7.2
-          - laravel: 8.*
-            php: 8.1
           - laravel: 8.*
             php: 8.0
+          - laravel: 8.*
+            php: 8.1
           - laravel: 8.*
             php: 8.2
+          - laravel: 8.*
+            php: 8.3
           - laravel: 9.*
             php: 7.2
           - laravel: 9.*
@@ -59,6 +68,18 @@ jobs:
             php: 7.4
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 7.2
+          - laravel: 11.*
+            php: 7.2
+          - laravel: 11.*
+            php: 7.3
+          - laravel: 11.*
+            php: 7.4
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -67,10 +88,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
@@ -94,7 +115,7 @@ jobs:
         run: composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
 
       - name: Update dependencies
-        run: composer update --prefer-dist --no-interaction --no-suggest
+        run: composer update --prefer-dist --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -16,18 +16,21 @@
     "require": {
         "php":                       "^7.2|^8.0",
         "ext-dom":                   "*",
-        "illuminate/contracts":      "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/support":        "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/mail":           "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/contracts":      "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/support":        "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/mail":           "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
         "masterminds/html5":         "^2.7",
         "ext-curl":                  "*",
         "ext-fileinfo":              "*"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
-        "phpunit/phpunit": "^8.5.30|^9.0|^10.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^8.5.30|^9.0|^10.0|^11.0",
         "squizlabs/php_codesniffer": "^3.5"
     },
+    "config": {
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "Eduardokum\\LaravelMailAutoEmbed\\": "src"
@@ -44,5 +47,7 @@
                 "Eduardokum\\LaravelMailAutoEmbed\\ServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }