From b22b9d8adb9cb86e18bfd87f9aeee082f39e2c82 Mon Sep 17 00:00:00 2001
From: Alessio <alessio.vertemati@gmail.com>
Date: Fri, 13 Nov 2020 10:59:50 +0100
Subject: [PATCH 1/3] Add Laravel 8

---
 composer.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 67d36d9..c0cdfde 100644
--- a/composer.json
+++ b/composer.json
@@ -18,21 +18,21 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "illuminate/auth": "^7.0",
-        "illuminate/console": "^7.0",
-        "illuminate/encryption": "^7.0",
-        "illuminate/support": "^7.0",
-        "illuminate/view": "^7.0",
-        "laravel/socialite": "^4.4",
-        "socialiteproviders/gitlab": "^3.1",
+        "illuminate/auth": "^7.0|^8.0",
+        "illuminate/console": "^7.0|^8.0",
+        "illuminate/encryption": "^7.0|^8.0",
+        "illuminate/support": "^7.0|^8.0",
+        "illuminate/view": "^7.0|^8.0",
+        "laravel/socialite": "^4.4|^5.0",
+        "socialiteproviders/gitlab": "^3.1|^4.0",
         "socialiteproviders/dropbox": "^4.1",
-        "laravel/ui": "^2.1"
+        "laravel/ui": "^2.1|^3.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.9.1",
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^8.5|^9.0",
-        "orchestra/testbench": "^5.0",
+        "phpunit/phpunit": "^8.5|^9.3",
+        "orchestra/testbench": "^5.0|^6.0",
         "friendsofphp/php-cs-fixer": "^2.16"
     },
     "autoload": {

From 30a45cb309f8808ef15f1d1273f59a9df55f11ea Mon Sep 17 00:00:00 2001
From: Alessio <alessio.vertemati@gmail.com>
Date: Fri, 13 Nov 2020 11:00:17 +0100
Subject: [PATCH 2/3] Include PHP 8.0 and Laravel 8 in matrix

---
 .github/workflows/ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dac6e9b..24f7553 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4]
-        laravel: ["7.*"]
+        php: [7.2, 7.3, 7.4, 8.0]
+        laravel: ["7.*", "8.*"]
+        stability: [prefer-lowest, prefer-stable]
+        exclude:
+          - laravel: "8.*"
+            php: 7.2
     
     steps:
     - uses: actions/checkout@v2
@@ -27,7 +31,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.composer/cache/files
-        key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+        key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ matrix.stability }}-${{ hashFiles('composer.json') }}
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -38,7 +42,7 @@ jobs:
       
     - name: Install dependencies
       run: |
-        composer require "illuminate/support:${{ matrix.laravel }}" --prefer-dist --no-interaction
+        composer require "illuminate/support:${{ matrix.laravel }}" --${{ matrix.stability }} --prefer-dist --no-interaction
 
     - name: Run Testsuite
       run: ./vendor/bin/phpunit

From eda9566315cc99b81aa06ceeaf59232d815ace93 Mon Sep 17 00:00:00 2001
From: Alessio <alessio.vertemati@gmail.com>
Date: Fri, 13 Nov 2020 11:03:29 +0100
Subject: [PATCH 3/3] Remove PHP 8.0 as unsupported from socialite drivers

---
 .github/workflows/ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24f7553..219af64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: [7.2, 7.3, 7.4]
         laravel: ["7.*", "8.*"]
-        stability: [prefer-lowest, prefer-stable]
         exclude:
           - laravel: "8.*"
             php: 7.2
@@ -31,7 +30,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.composer/cache/files
-        key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ matrix.stability }}-${{ hashFiles('composer.json') }}
+        key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -42,7 +41,7 @@ jobs:
       
     - name: Install dependencies
       run: |
-        composer require "illuminate/support:${{ matrix.laravel }}" --${{ matrix.stability }} --prefer-dist --no-interaction
+        composer require "illuminate/support:${{ matrix.laravel }}" --prefer-dist --no-interaction
 
     - name: Run Testsuite
       run: ./vendor/bin/phpunit