Merge pull request #16 from ARCANEDEV/update-laravel_5.6_support

Adding Laravel 5.6 Support
ARCANEDEV · Feb 20, 2018 · 9bd728d · 9bd728d
2 parents ced27b7 + da0fb88
commit 9bd728d
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /vendor/
 /composer.lock
 /composer.phar
+/phpunit.xml
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: php
 sudo: false
 
 php:
-  - 7.0
+  - 7.1.3
   - 7.1
   - 7.2
   - nightly

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 ARCANEDEV <[email protected]> - Laravel Tracker
+Copyright (c) 2016-2018 ARCANEDEV <[email protected]> - Laravel Tracker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -18,7 +18,18 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelTracke
 
 ## Features
 
-  - Coming soon&hellip;
+  * Multiple tracking features &hellip;
+  * Well tested with maximum code quality.
+  * Easy setup &amp; configuration.
+  * Laravel `5.1 | 5.2 | 5.3 | 5.4 | 5.5 | 5.6` are supported.
+  * Well documented &amp; IDE Friendly.
+  * Made with :heart: &amp; :coffee:.
+
+## Table of contents
+
+  1. [Installation and Setup](_docs/1-Installation-and-Setup.md)
+  2. [Configuration](_docs/2-Configuration.md)
+  3. [Usage](_docs/3-Usage.md)
 
 ## Security
 
@@ -28,7 +39,7 @@ If you discover any security related issues, please email arcanedev-maroc@gmail.
 
 Any ideas are welcome. Feel free to submit any issues or pull requests, please check the [contribution guidelines](CONTRIBUTING.md).
 
-[badge_laravel]:   https://img.shields.io/badge/Laravel-5.4%20to%205.5-orange.svg?style=flat-square
+[badge_laravel]:   https://img.shields.io/badge/Laravel-5.4%20to%205.6-orange.svg?style=flat-square
 [badge_license]:   https://img.shields.io/packagist/l/arcanedev/laravel-tracker.svg?style=flat-square
 
 [badge_build]:     https://img.shields.io/travis/ARCANEDEV/LaravelTracker.svg?style=flat-square

diff --git a/_docs/0-Home.md b/_docs/0-Home.md
diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md
diff --git a/_docs/2-Configuration.md b/_docs/2-Configuration.md
diff --git a/_docs/3-Usage.md b/_docs/3-Usage.md
diff --git a/composer.json b/composer.json
@@ -16,20 +16,19 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                      ">=7.0",
-        "arcanedev/agent":          "~3.0",
-        "arcanedev/geo-ip":         "~2.2.0",
-        "arcanedev/support":        "~4.2.0",
+        "php":                      ">=7.1.3",
+        "arcanedev/agent":          "~4.0",
+        "arcanedev/geo-ip":         "~2.3.0",
+        "arcanedev/support":        "~4.3.0",
         "jaybizzle/crawler-detect": "~1.2",
         "ramsey/uuid":              "~3.6",
         "snowplow/referer-parser":  "~0.2",
         "ua-parser/uap-php" :       "~3.4"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.5.0",
-        "orchestra/database":  "~3.5.0",
-        "phpunit/phpunit":     "~6.0",
-        "phpunit/phpcov":      "~4.0"
+        "orchestra/testbench": "~3.6.0",
+        "phpunit/phpunit":     "~7.0",
+        "phpunit/phpcov":      "~5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -32,7 +32,6 @@ public function setUp()
     protected function getPackageProviders($app)
     {
         return [
-            \Orchestra\Database\ConsoleServiceProvider::class,
             \Arcanedev\LaravelTracker\LaravelTrackerServiceProvider::class,
         ];
     }
@@ -133,15 +132,13 @@ function () {
      */
     protected function migrate()
     {
-        $this->artisan('migrate', [
-            '--database' => 'testing',
-            '--realpath' => $this->getMigrationsSrcPath(),
-        ]);
+        $this->loadMigrationsFrom(
+            $this->getMigrationsSrcPath()
+        );
 
-        $this->artisan('migrate', [
-            '--database' => 'testing',
-            '--realpath' => realpath(__DIR__ . '/fixtures/migrations'),
-        ]);
+        $this->loadMigrationsFrom(
+            realpath(__DIR__ . '/fixtures/migrations')
+        );
     }
 
     /**
@@ -151,7 +148,7 @@ protected function migrate()
      */
     protected function getMigrationsSrcPath()
     {
-        return realpath(dirname(__DIR__) . '/database/migrations');
+        return realpath(__DIR__.'/../database/migrations');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ language: php @@
     sudo: false
     php:
-      - 7.0
+      - 7.1.3
       - 7.1
       - 7.2
       - nightly
@@ Expand Down @@