From fb96837e692dc05234bdff98b17c75362d9c58a3 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Wed, 12 Jan 2022 18:58:50 +0100
Subject: [PATCH] Laravel 9 (#956)

* Laravel 9

* wip
---
 .github/workflows/tests.yml | 38 +++++++++++++++++++++----------------
 composer.json               | 14 +++++++-------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6a733414c..a3d0dd080 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,32 +13,38 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0, 8.1]
-        laravel: [^6.0, ^7.0, ^8.0]
-        phpunit: [^8.4, ^9.0]
+        php: [7.2, 7.3, 7.4, '8.0', 8.1]
+        laravel: [6, 7, 8, 9]
+        phpunit: [8, 9]
         include:
           - php: 7.2
-            laravel: ^6.0
-            phpunit: ^7.5
+            laravel: 6
+            phpunit: 7
           - php: 7.3
-            laravel: ^6.0
-            phpunit: ^7.5
+            laravel: 6
+            phpunit: 7
           - php: 7.4
-            laravel: ^6.0
-            phpunit: ^7.5
+            laravel: 6
+            phpunit: 7
         exclude:
           - php: 7.2
-            phpunit: ^9.0
+            phpunit: 9
           - php: 7.2
-            laravel: ^8.0
+            laravel: 8
+          - php: 7.2
+            laravel: 9
+          - php: 7.3
+            laravel: 9
+          - php: 7.4
+            laravel: 9
           - php: 8.0
-            phpunit: ^8.4
+            phpunit: 8
           - php: 8.1
-            phpunit: ^8.4
+            phpunit: 8
           - php: 8.1
-            laravel: ^6.0
+            laravel: 6
           - php: 8.1
-            laravel: ^7.0
+            laravel: 7
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - PHPUnit ${{ matrix.phpunit }}
 
@@ -56,7 +62,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-update
+           composer require "illuminate/contracts:^${{ matrix.laravel }}" "phpunit/phpunit:^${{ matrix.phpunit }}" --dev --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index cefecef22..b84c44c0a 100644
--- a/composer.json
+++ b/composer.json
@@ -15,17 +15,17 @@
         "ext-zip": "*",
         "php-webdriver/webdriver": "^1.9.0",
         "nesbot/carbon": "^2.0",
-        "illuminate/console": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "symfony/console": "^4.3|^5.0",
-        "symfony/finder": "^4.3|^5.0",
-        "symfony/process": "^4.3|^5.0",
-        "vlucas/phpdotenv": "^3.0|^4.0|^5.0"
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
+        "symfony/console": "^4.3|^5.0|^6.0",
+        "symfony/finder": "^4.3|^5.0|^6.0",
+        "symfony/process": "^4.3|^5.0|^6.0",
+        "vlucas/phpdotenv": "^3.0|^4.0|^5.2"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^7.5.15|^8.4|^9.0",
-        "orchestra/testbench": "^4.16|^5.17.1|^6.12.1"
+        "orchestra/testbench": "^4.16|^5.17.1|^6.12.1|^7.0"
     },
     "suggest": {
         "ext-pcntl": "Used to gracefully terminate Dusk when tests are running."