From ae1e11a8569902d8284f016cf244f34d0b00d72a Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen <info@it-can.nl>
Date: Fri, 1 Sep 2017 09:36:59 +0200
Subject: [PATCH 1/4] add laravel 5.5 auto-discovery

---
 composer.json | 10 ++++++++++
 readme.md     |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 58c1a30..eded41b 100644
--- a/composer.json
+++ b/composer.json
@@ -26,5 +26,15 @@
   "require-dev": {
     "phpunit/phpunit": "^5.3",
     "mockery/mockery": "^0.9.4"
+  },
+  "extra": {
+      "laravel": {
+          "providers": [
+              "Laravelista\\Ekko\\EkkoServiceProvider"
+          ],
+          "aliases": {
+              "Ekko": "Laravelista\\Ekko\\Facades\\Ekko"
+          }
+      }
   }
 }
diff --git a/readme.md b/readme.md
index e262a42..9e8ac6a 100644
--- a/readme.md
+++ b/readme.md
@@ -64,7 +64,9 @@ From the command line:
 composer require laravelista/ekko
 ```
 
-Include the service provider in `config/app.php`:
+Laravel 5.5+ will use auto-discovery function.
+
+If using 5.4 (or not using auto-discovery) you will need to include the service providers / facade in `app/config/app.php`:
 
 ```php
 'providers' => [

From ff3458efb0125ad4e8c2896cb88a6e3a5971dae0 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen <info@it-can.nl>
Date: Fri, 1 Sep 2017 09:37:43 +0200
Subject: [PATCH 2/4] fix readme

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9e8ac6a..cd83d8d 100644
--- a/readme.md
+++ b/readme.md
@@ -66,7 +66,7 @@ composer require laravelista/ekko
 
 Laravel 5.5+ will use auto-discovery function.
 
-If using 5.4 (or not using auto-discovery) you will need to include the service providers / facade in `app/config/app.php`:
+If using 5.4 (or not using auto-discovery) you will need to include the service providers / facade in `config/app.php`:
 
 ```php
 'providers' => [

From 4479aba8112560db7cc5bc60e1f85479bb8bd533 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen <info@it-can.nl>
Date: Fri, 1 Sep 2017 10:10:33 +0200
Subject: [PATCH 3/4] fix readme

---
 readme.md | 56 +++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/readme.md b/readme.md
index cd83d8d..9802da6 100644
--- a/readme.md
+++ b/readme.md
@@ -10,6 +10,34 @@
 
 Ekko is a Laravel helper package. It helps you mark currently active menu item in your navbar.
 
+## Installation
+
+From the command line:
+
+```bash
+composer require laravelista/ekko
+```
+
+Laravel 5.5+ will use the auto-discovery function.
+
+If using 5.4 (or if you are not using auto-discovery) you will need to include the service providers / facade in `config/app.php`:
+
+```php
+'providers' => [
+    ...,
+    Laravelista\Ekko\EkkoServiceProvider::class
+];
+```
+
+And add a facade alias to the same file at the bottom:
+
+```php
+'aliases' => [
+    ...,
+    'Ekko' => Laravelista\Ekko\Facades\Ekko::class
+];
+```
+
 ## Overview
 
 To mark a menu item active in [Bootstrap](http://getbootstrap.com/components/#navbar), you need to add a `active` CSS class to the `<li>` tag:
@@ -56,34 +84,6 @@ Using boolean `true` or `false` is convenient if you need to display some conten
 @endif
 ```
 
-## Installation
-
-From the command line:
-
-```bash
-composer require laravelista/ekko
-```
-
-Laravel 5.5+ will use auto-discovery function.
-
-If using 5.4 (or not using auto-discovery) you will need to include the service providers / facade in `config/app.php`:
-
-```php
-'providers' => [
-    ...,
-    Laravelista\Ekko\EkkoServiceProvider::class
-];
-```
-
-And add a facade alias to the same file at the bottom:
-
-```php
-'aliases' => [
-    ...,
-    'Ekko' => Laravelista\Ekko\Facades\Ekko::class
-];
-```
-
 ## API
 
 There are two ways of using Ekko in your application, by using a facade `Ekko::isActiveURL('/about')` or by using a helper function `isActiveURL('/about')`.

From 1aa99c7d8e58547089e4b3a48e24722bc69bcab0 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen <info@it-can.nl>
Date: Fri, 1 Sep 2017 13:17:41 +0200
Subject: [PATCH 4/4] remove hhvm + add php7 + php 7.1

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6d6559..2bf9f76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,12 @@ language: php
 
 php:
   - 5.6
-  - hhvm
+  - 7.0
+  - 7.1
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --prefer-dist --no-interaction --dev
 
-script: 
+script:
   - vendor/bin/phpunit