From 7e88654a40aac1ce164194153b336c3f21c23636 Mon Sep 17 00:00:00 2001
From: Nathan Heinrich <nathan@halfinity.com>
Date: Sun, 27 Dec 2020 08:05:21 +1000
Subject: [PATCH] PHP 8.0 Support (#48)

---
 .github/workflows/php.yml | 4 +++-
 composer.json             | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1f29787..8da4027 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: ['7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4', '8.0']
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - OS ${{ matrix.os }} - ${{ matrix.dependency-version }}
@@ -38,3 +38,5 @@ jobs:
         run: |
           wget https://scrutinizer-ci.com/ocular.phar
           php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+        # Disable on PHP 8 as Ocular isn't supported
+        if: matrix.php < 8
diff --git a/composer.json b/composer.json
index 7854ed2..17e3fa1 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "illuminate/notifications": "^6.0 || ^7.0 || ^8.0",
@@ -28,7 +28,7 @@
         "textalk/websocket": "^1.2"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3",
+        "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^5.0 || ^6.0",
         "phpunit/phpunit": "^8.5 || ^9.0"
     },