Merge pull request #8 from ARCANEDEV/update-laravel_5.4_support

Adding Laravel 5.4 Support
ARCANEDEV · Jan 31, 2017 · 58358eb · 58358eb
2 parents 99e291d + 1a16eea
commit 58358eb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -21,8 +21,8 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 900
-        runs: 9
+        timeout: 600
+        runs: 3
     php_code_sniffer:
         enabled: true
         config:

diff --git a/.travis.yml b/.travis.yml
@@ -13,13 +13,11 @@ matrix:
     - php: nightly
 
 env:
-  - TESTBENCH_VERSION=3.1.*
-  - TESTBENCH_VERSION=3.2.*
-  - TESTBENCH_VERSION=3.3.*
+  - TESTBENCH_VERSION=3.4.*
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench:${TESTBENCH_VERSION}"
+  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench-browser-kit:${TESTBENCH_VERSION}" "orchestra/database:${TESTBENCH_VERSION}"
 
 script:
   - composer validate

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php":                      ">=5.6.4",
         "arcanedev/geo-ip":         "~2.0",
-        "arcanedev/support":        "~3.20",
+        "arcanedev/support":        "~4.0",
         "jaybizzle/crawler-detect": "~1.0",
         "jenssegers/agent":         "~2.0",
         "ramsey/uuid":              "~3.0",
@@ -40,11 +40,13 @@
         }
     },
     "scripts": {
-        "testbench": "composer require --dev \"orchestra/testbench=~3.0\""
+        "testbench": "composer require --dev \"orchestra/testbench-browser-kit=~3.0\" \"orchestra/database=~3.0\""
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable" : true
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\Tests;
 
-use Orchestra\Testbench\TestCase as BaseTestCase;
+use Orchestra\Testbench\BrowserKit\TestCase as BaseTestCase;
 
 /**
  * Class     TestCase
@@ -31,6 +31,7 @@ public function setUp()
     protected function getPackageProviders($app)
     {
         return [
+            \Orchestra\Database\ConsoleServiceProvider::class,
             \Arcanedev\LaravelTracker\LaravelTrackerServiceProvider::class,
         ];
     }
@@ -109,13 +110,9 @@ private function settingConfigs($config)
      */
     private function settingRoutes($router)
     {
-        $router->middleware('tracked', \Arcanedev\LaravelTracker\Middleware\Tracking::class);
+        $router->aliasMiddleware('tracked', \Arcanedev\LaravelTracker\Middleware\Tracking::class);
 
-        $attributes = version_compare('5.2.0', app()->version(), '<=')
-            ? ['middleware' => ['web', 'tracked']]
-            : ['middleware' => 'tracked'];
-
-        $router->group($attributes, function () use ($router) {
+        $router->group(['middleware' => ['web', 'tracked']], function () use ($router) {
             $router->get('/', [
                 'as' => 'home',
                 function () {