Merge pull request #12 from helpscout/php-8

Supporting PHP 8
helpscout · Mar 31, 2021 · 443ac16 · 443ac16
2 parents a7f21b2 + 99883a4
commit 443ac16
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,17 @@
 env:
   matrix:
-    - ILLUMINATE_VERSION="^6.0"
-    - ILLUMINATE_VERSION="^7.0"
+    - ILLUMINATE_VERSION="^8.0"
 #    Add other versions here to test against multiple framework versions
   global:
     - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+    - XDEBUG_MODE=coverage
 
 language: php
 
 php:
   - 7.3
   - 7.4
+  - 8.0
 
 before_script:
   - composer self-update

diff --git a/composer.json b/composer.json
@@ -16,12 +16,12 @@
     "source": "https://github.com/helpscout/helpscout-api-php-laravel"
   },
   "require": {
-    "php": "^7.3",
+    "php": "^7.3|^8.0",
     "helpscout/api": "~3.0",
     "illuminate/support": "^5.6|^6.0|^7.0|^8.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^8.0",
     "phpstan/phpstan": "^0.12",
     "friendsofphp/php-cs-fixer": "^2.3"
   },

diff --git a/tests/LaravelServiceProviderTest.php b/tests/LaravelServiceProviderTest.php
@@ -9,7 +9,7 @@
 
 class LaravelServiceProviderTest extends ServiceProviderTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         if (!class_exists(Application::class)) {
             $this->markTestSkipped();

diff --git a/tests/LumenServiceProviderTest.php b/tests/LumenServiceProviderTest.php
@@ -9,7 +9,7 @@
 
 class LumenServiceProviderTest extends ServiceProviderTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         if (!class_exists(Application::class)) {
             $this->markTestSkipped();

diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -18,7 +18,7 @@ abstract class ServiceProviderTest extends TestCase
      */
     protected $app;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->app = $this->setupApplication();