Merge pull request #11 from ben182/develop

Laravel 5.8 Support
ben182 · Apr 13, 2019 · 4e6963d · 4e6963d
2 parents 9524658 + 49f150f
commit 4e6963d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,14 @@ cache:
 
 env:
     - ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
-    - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0 COVERAGE=true
+    - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
+    - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~8.0 COVERAGE=true
 
 matrix:
     fast_finish: true
+    exclude:
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~8.0 COVERAGE=true
 
 before_install:
     - travis_retry composer self-update

diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
     ],
     "require": {
         "php": "^7.1",
-        "illuminate/support": "5.6.* || 5.7.*",
+        "illuminate/support": "5.6.* || 5.7.* || 5.8.*",
         "stichoza/google-translate-php": "^4.0",
         "themsaid/laravel-langman": "^1.3"
     },
     "require-dev": {
-        "orchestra/testbench": "3.6.* || 3.7.*",
-        "phpunit/phpunit": "^7.0",
+        "orchestra/testbench": "3.6.* || 3.7.* || 3.8.*",
+        "phpunit/phpunit": "^8.0",
         "mockery/mockery": "^1.2"
     },
     "autoload": {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -7,13 +7,13 @@
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         exec('rm -rf '.__DIR__.'/temp/*');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         exec('rm -rf '.__DIR__.'/temp/*');