✨ Add Laravel 6 support (#35)

Author: axlon

.scrutinizer.yml

@@ -10,5 +10,5 @@ checks:
 
 tools:
   external_code_coverage:
-    runs: 24
+    runs: 26
     timeout: 900

.travis.yml

@@ -10,21 +10,27 @@ php:
   - 7.3
 
 env:
-  - ILLUMINATE_VERSION=5.1.* TESTBENCH_VERSION=3.1.* PHPUNIT_VERSION=^5.2
-  - ILLUMINATE_VERSION=5.2.* TESTBENCH_VERSION=3.2.* PHPUNIT_VERSION=^5.2
-  - ILLUMINATE_VERSION=5.3.* TESTBENCH_VERSION=3.3.* PHPUNIT_VERSION=^5.2
-  - ILLUMINATE_VERSION=5.4.* TESTBENCH_VERSION=3.4.* PHPUNIT_VERSION=^5.2
-  - ILLUMINATE_VERSION=5.5.* TESTBENCH_VERSION=3.5.* PHPUNIT_VERSION=^6.0
-  - ILLUMINATE_VERSION=5.6.* TESTBENCH_VERSION=3.6.* PHPUNIT_VERSION=^7.0
-  - ILLUMINATE_VERSION=5.7.* TESTBENCH_VERSION=3.7.* PHPUNIT_VERSION=^7.0
-  - ILLUMINATE_VERSION=5.8.* TESTBENCH_VERSION=3.8.* PHPUNIT_VERSION=^7.0
+  - ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=^5.2
+  - ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=^5.2
+  - ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=^5.2
+  - ILLUMINATE_VERSION=5.4.* PHPUNIT_VERSION=^5.2
+  - ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=^6.0
+  - ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=^7.0
+  - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=^7.0
+  - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=^7.0
+  - ILLUMINATE_VERSION=^6.0  PHPUNIT_VERSION=^7.0
+
+matrix:
+  exclude:
+    # Laravel 6 does not support PHP 7.1
+    - php: 7.1
+      env: ILLUMINATE_VERSION=^6.0  PHPUNIT_VERSION=^7.0
 
 dist: xenial
 sudo: false
 
 before_install:
   - composer require illuminate/support:${ILLUMINATE_VERSION} --no-update
-  - composer require orchestra/testbench:${TESTBENCH_VERSION} --dev --no-update
   - composer require phpunit/phpunit:"${PHPUNIT_VERSION}" --dev --no-update
 
 install:

composer.json

@@ -28,11 +28,11 @@
         "guzzlehttp/guzzle": "^6.2",
         "guzzlehttp/promises": "^1.0",
         "guzzlehttp/psr7": "^1.4",
-        "illuminate/support": "^5.1,<5.9",
+        "illuminate/support": "^5.1 || ^6.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.1",
+        "illuminate/routing": "^5.1 || ^6.0",
         "phpunit/phpunit": "^5.2 || ^6.0 || ^7.0"
     },
     "autoload": {

tests/Integration/BitLyShortenerTest.php

@@ -6,7 +6,7 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use LaraCrafts\UrlShortener\Http\BitLyShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class BitLyShortenerTest extends TestCase
 {
@@ -24,7 +24,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        if (!$token = env('BIT_LY_API_TOKEN')) {
+        if (!$token = getenv('BIT_LY_API_TOKEN')) {
             $this->markTestSkipped('No Bit.ly API token set');
         }
 

tests/Integration/FirebaseShortenerTest.php

@@ -6,7 +6,7 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use LaraCrafts\UrlShortener\Http\FirebaseShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class FirebaseShortenerTest extends TestCase
 {
@@ -29,11 +29,11 @@ public function setUp(): void
     {
         parent::setUp();
 
-        if (!$token = env('FIREBASE_API_TOKEN')) {
+        if (!$token = getenv('FIREBASE_API_TOKEN')) {
             $this->markTestSkipped('No Firebase API token set');
         }
 
-        if (!$prefix = env('FIREBASE_URI_PREFIX')) {
+        if (!$prefix = getenv('FIREBASE_URI_PREFIX')) {
             $this->markTestSkipped('No Firebase URI prefix set');
         }
 

tests/Integration/IsGdShortenerTest.php

@@ -6,7 +6,7 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use LaraCrafts\UrlShortener\Http\IsGdShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class IsGdShortenerTest extends TestCase
 {

tests/Integration/OuoIoShortenerTest.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Str;
 use LaraCrafts\UrlShortener\Http\OuoIoShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class OuoIoShortenerTest extends TestCase
 {
@@ -25,7 +25,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        if (!$token = env('OUO_IO_API_TOKEN')) {
+        if (!$token = getenv('OUO_IO_API_TOKEN')) {
             $this->markTestSkipped('No Ouo.io API token set');
         }
 

tests/Integration/ShorteStShortenerTest.php

@@ -6,7 +6,7 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use LaraCrafts\UrlShortener\Http\ShorteStShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ShorteStShortenerTest extends TestCase
 {
@@ -24,7 +24,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        if (!$token = env('SHORTE_ST_API_TOKEN')) {
+        if (!$token = getenv('SHORTE_ST_API_TOKEN')) {
             $this->markTestSkipped('No Shorte.st API token set');
         }
 

tests/Integration/TinyUrlShortenerTest.php

@@ -6,7 +6,7 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use LaraCrafts\UrlShortener\Http\TinyUrlShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class TinyUrlShortenerTest extends TestCase
 {

tests/Integration/VGdShortenerTest.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Str;
 use LaraCrafts\UrlShortener\Http\IsGdShortener;
 use LaraCrafts\UrlShortener\Tests\Concerns\HasUrlAssertions;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class VGdShortenerTest extends TestCase
 {