Support Laravel 9 (#28)

* Update composer.json * Update tests.yml * Update tests.yml * Update tests.yml * Update composer.json * Update tests.yml * Update tests.yml * Update tests.yml
Propaganistas · Jan 15, 2022 · 955ff76 · 955ff76
1 parent 52386da
commit 955ff76
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,24 +14,23 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        laravel: [ 6.*, 7.*, 8.* ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
+        laravel: [ 6, 7, 8, 9 ]
+        stability: [ prefer-lowest, prefer-stable ]
         exclude:
           - php: 7.2
-            laravel: 8.*
+            laravel: 8
+          - php: 7.2
+            laravel: 9
+          - php: 7.3
+            laravel: 9
+          - php: 7.4
+            laravel: 9
           - php: 8.1
-            laravel: 6.*
+            laravel: 6
           - php: 8.1
-            laravel: 7.*
-        include:
-          - laravel: 6.*
-            testbench: 4.*
-          - laravel: 7.*
-            testbench: 5.*
-          - laravel: 8.*
-            testbench: ^6.23
+            laravel: 7
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (${{ matrix.stability }})
 
     steps:
       - name: Checkout code
@@ -44,12 +43,16 @@ jobs:
           extensions: dom, curl, json, libxml, mbstring, zip
           tools: composer:v2
           coverage: none
+
+      - name: Patch testbench version
+        if: matrix.php == 8.1 && matrix.laravel == 8
+        run: |
+          composer require "orchestra/testbench=^6.23" --dev --no-interaction --no-update
 
       - name: Install dependencies
         run: |
-          composer require "illuminate/support:${{ matrix.laravel }}" --no-interaction --no-update
-          composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress
+          composer require "illuminate/support=^${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
     "require": {
         "php": "^7.1|^8.0",
         "ext-json": "*",
-        "illuminate/cache": "^6.0|^7.0|^8.0",
-        "illuminate/config": "^6.0|^7.0|^8.0",
-        "illuminate/contracts": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/console": "^6.0|^7.0|^8.0",
-        "illuminate/validation": "^6.0|^7.0|^8.0"
+        "illuminate/cache": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/config": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/validation": "^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3|^1.4.2",
@@ -44,5 +44,7 @@
                 "Propaganistas\\LaravelDisposableEmail\\DisposableEmailServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }