From f2765e308977511c7ee42a48d635dca7026fa427 Mon Sep 17 00:00:00 2001
From: Propaganistas <Propaganistas@users.noreply.github.com>
Date: Sun, 6 Dec 2020 11:57:11 +0100
Subject: [PATCH] Support PHP 8.0 (#162)

---
 .github/workflows/tests.yml | 12 +++++++-----
 composer.json               |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4108b20..abba649 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.2, 7.3, 7.4]
+                php: [7.2, 7.3, 7.4, 8.0]
                 laravel: [6.*, 7.*, 8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 exclude:
@@ -37,7 +37,12 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: dom, curl, json, intl, libxml, mbstring, pdo, pdo_sqlite, sqlite
-
+                    
+            -   name: Setup Problem Matchers
+                run: |
+                    echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+                    echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+        
             -   name: Cache dependencies
                 uses: actions/cache@v1
                 with:
@@ -48,9 +53,6 @@ jobs:
                 run: |
                     composer require "illuminate/support:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
                     composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --no-progress
-                    
-            -   name: Configure matchers
-                uses: mheap/phpunit-matcher-action@master
               
             -   name: Execute tests
                 run: vendor/bin/phpunit --teamcity
diff --git a/composer.json b/composer.json
index a64e0ce..45ece83 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": "^7.1|^8.0",
         "illuminate/support": "^6.0|^7.0|^8.0",
         "illuminate/validation": "^6.0|^7.0|^8.0",
         "giggsey/libphonenumber-for-php": "^7.0|^8.0",
-        "league/iso3166": "^2.0"
+        "league/iso3166": "^2.0|^3.0"
     },
     "require-dev": {
         "orchestra/testbench": "*",