Merge pull request #79 from Sammyjo20/upgrade/laravel-11

Feature | Support Laravel 11
Sammyjo20 · Mar 13, 2024 · a378174 · a378174
2 parents 0efbd2f + cad9bef
commit a378174
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,16 +12,26 @@ permissions:
   contents: write
 
 jobs:
-  tests:
+  test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
-        php: [ 8.1, 8.2, 8.3 ]
-        stability: [ prefer-lowest, prefer-stable ]
-
-    name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
+        os: [ubuntu-latest, windows-latest]
+        php: [8.1, 8.2, 8.3]
+        laravel: ['10.*', '11.*']
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -34,18 +44,16 @@ jobs:
           extensions: mbstring, zip, fileinfo
           coverage: none
 
-      - name: Install Node Dependencies
-        run: |
-          npm install
-
       - name: Setup problem matchers
         run: |
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Install dependencies
         run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          npm install
 
       - name: Execute tests
         run: ./vendor/bin/pest
diff --git a/composer.json b/composer.json
@@ -14,15 +14,15 @@
         "php": "^8.1",
         "ext-json": "*",
         "ext-zip": "*",
-        "illuminate/console": "^9.0 || ^10.0",
-        "illuminate/filesystem": "^9.0 || ^10.0",
-        "illuminate/support": "^9.0 || ^10.0",
-        "symfony/finder": "^6.0",
-        "symfony/process": "^6.0",
+        "illuminate/console": "^10.0 || ^11.0",
+        "illuminate/filesystem": "^10.0 || ^11.0",
+        "illuminate/support": "^10.0 || ^11.0",
+        "symfony/finder": "^6.0 || ^7.0",
+        "symfony/process": "^6.0 || ^7.0",
         "league/flysystem": "^3.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0 || ^8.0",
+        "orchestra/testbench": "^8.0 || ^9.0",
         "friendsofphp/php-cs-fixer": "^3.1.0",
         "spatie/ray": "^1.33",
         "pestphp/pest": "^2.25",