Merge pull request #124 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility
spatie · Feb 29, 2024 · 024752c · 024752c
2 parents 8cde488 + bdadb28
commit 024752c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,16 +1,19 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.1, 8.0]
-        laravel: [9.*, 8.*, 10.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
@@ -19,23 +22,25 @@ jobs:
             testbench: 7.*
           - laravel: 8.*
             testbench: ^6.23
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
           - laravel: 10.*
-            php: 8.0        
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 11.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
     steps:
       - uses: actions/setup-node@v4
         with:
-           node-version: 10
+          node-version: 10
+
       - name: Install tools
-        run: sudo apt-get install jpegoptim
-             && sudo apt-get install pngquant
-             && sudo apt-get install gifsicle
-             && sudo apt-get install optipng
-             && sudo apt-get install libjpeg-progs
-             && npm install -g svgo
+        run: sudo apt-get install jpegoptim && sudo apt-get install pngquant && sudo apt-get install gifsicle && sudo apt-get install optipng && sudo apt-get install libjpeg-progs && npm install -g svgo
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^8.0",
-        "laravel/framework": "^8.0|^9.0|^10.0",
+        "laravel/framework": "^8.0|^9.0|^10.0|^11.0",
         "spatie/image-optimizer": "^1.2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.23|^7.0|^8.0",
-        "phpunit/phpunit": "^9.4"
+        "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.4|^10.5"
     },
     "autoload": {
         "psr-4": {