Add support for Laravel 6

Author: ivanvermeyen

.travis.yml

@@ -1,18 +1,44 @@
 language: php
 
-php:
-  - 7.1
-  - 7.2
+matrix:
+    include:
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.1
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.2
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=6.* TESTBENCH_VERSION=4.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.*
+        - php: 7.3
+          env: ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.*
+
+before_script:
+
+before_install:
+    - travis_retry composer self-update
+    - composer require "orchestra/testbench:${TESTBENCH_VERSION}" --no-update --dev
+    - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
+
+install: composer update --prefer-source --no-interaction
 
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.composer/cache
-
-before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update --no-interaction
+    directories:
+        - $HOME/.composer/cache
 
 script:
-  - vendor/bin/phpunit
+    - vendor/bin/phpunit

composer.json

@@ -23,12 +23,12 @@
     "require": {
         "php": "^7.1",
         "codezero/browser-locale": "^3.0",
-        "illuminate/support": "^5.6"
+        "illuminate/support": ">=5.6"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "3.6.*",
-        "phpunit/phpunit": "^7.0"
+        "orchestra/testbench": ">=3.6",
+        "phpunit/phpunit": "^7.0|^8.0"
     },
     "scripts": {
         "test": "phpunit"

tests/Feature/SetLocaleTest.php

@@ -21,7 +21,7 @@ class SetLocaleTest extends TestCase
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -4,6 +4,7 @@
 
 use CodeZero\Localizer\LocalizerServiceProvider;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends  BaseTestCase
@@ -13,11 +14,11 @@ abstract class TestCase extends  BaseTestCase
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
-        Config::set('app.key', str_random(32));
+        Config::set('app.key', Str::random(32));
     }
 
     /**