From 057a56fc21b34d73bedb7bcac195ba70a1d90a03 Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Tue, 23 Feb 2021 23:52:28 +0300
Subject: [PATCH 1/4] support PHP 8.0

---
 composer.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 00563d1..637307c 100755
--- a/composer.json
+++ b/composer.json
@@ -18,17 +18,16 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
         "jaybizzle/crawler-detect": "^1.2",
         "spatie/laravel-referer": "^1.6",
-        "torann/geoip": "^1.0"
+        "torann/geoip": "^1.0|^3.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.5.2",
-        "fzaninotto/faker": "^1.6",
+        "doctrine/dbal": "^2.6|^3.0",
         "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
-        "mockery/mockery": "^1.3",
+        "mockery/mockery": "^1.4",
         "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0",
         "phpunit/phpunit": "^9.3",
         "predis/predis": "^1.1"

From 245e1d4569d565809622c50e6c556652941f8e72 Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Tue, 23 Feb 2021 23:55:13 +0300
Subject: [PATCH 2/4] Add PHP 8.0 to Github tests

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index c37f59d..6fded99 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [7.3, 7.4]
+                php: [7.3, 7.4, 8.0]
                 laravel: [6.*, 7.*, 8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:

From d3664cb8b7e31dc0bfc61531c287e57dddd24938 Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Wed, 24 Feb 2021 00:14:08 +0300
Subject: [PATCH 3/4] ignore L6 + L7 on PHP 8 ?

---
 .github/workflows/run-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 6fded99..e6cb6ac 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -19,6 +19,10 @@ jobs:
                         testbench: 5.*
                     -   laravel: 6.*
                         testbench: 4.*
+                exclude:
+                    # excludes laravel 6 on php8
+                    -   php: 8.0
+                        laravel: [6.*,7.*]
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

From 52ce0dc617f144371f5e4f6e1ef9f57e3db33501 Mon Sep 17 00:00:00 2001
From: Abdulrahman <saanina@gmail.com>
Date: Wed, 24 Feb 2021 00:16:27 +0300
Subject: [PATCH 4/4] wip

---
 .github/workflows/run-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index e6cb6ac..947958d 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -20,9 +20,11 @@ jobs:
                     -   laravel: 6.*
                         testbench: 4.*
                 exclude:
-                    # excludes laravel 6 on php8
+                    # excludes laravel 6+7 on php8
                     -   php: 8.0
-                        laravel: [6.*,7.*]
+                        laravel: 6.*
+                    -   php: 8.0
+                        laravel: 7.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}