From 7c5457fd799d004985fb4f210ff1be3e1f895680 Mon Sep 17 00:00:00 2001
From: Vincent Garnier <forxer@gmail.com>
Date: Sun, 1 Oct 2017 22:40:42 +0200
Subject: [PATCH] add support for Laravel 5.5

---
 changelog.md  |  5 +++++
 composer.json | 15 +++++++++++----
 readme.md     | 21 +++------------------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/changelog.md b/changelog.md
index d2a222c..007b091 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for Laravel Extension
 ===============================
 
+5.2.0 (2017-10-01)
+------------------
+
+- add support for Laravel 5.5
+
 5.1.1 (2017-06-02)
 ------------------
 
diff --git a/composer.json b/composer.json
index b3d4966..bba2d0b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name" : "axn/laravel-extension",
-    "description" : "Includes various extensions to the Laravel framework 5.1+",
+    "description" : "Includes various extensions to the Laravel framework",
     "homepage" : "https://github.com/AXN-Informatique/laravel-extension",
     "support" : {
         "issues" : "https://github.com/AXN-Informatique/laravel-extension/issues"
@@ -12,9 +12,9 @@
     ],
     "license" : "MIT",
     "require" : {
-        "laravel/framework" : "5.4.*",
-        "laravelcollective/html" : "5.4.*",
-        "axn/laravel-common-languages-terms" : "dev-master"
+        "axn/laravel-common-languages-terms" : "dev-master",
+        "laravel/framework" : "5.4.*|5.5.*",
+        "laravelcollective/html" : "5.4.*|5.5.*"
     },
     "autoload" : {
         "psr-4" : {
@@ -24,5 +24,12 @@
             "src/helpers.php",
             "src/bootstrap.php"
         ]
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Axn\\Illuminate\\ServiceProvider"
+            ]
+        }
     }
 }
diff --git a/readme.md b/readme.md
index 79baa5b..116fcee 100644
--- a/readme.md
+++ b/readme.md
@@ -29,8 +29,9 @@ Inclure le package avec Composer :
 composer require axn/laravel-extension
 ```
 
-Si vous souhaitez enregistrer l'ensemble des providers d'un coup, ajoutez le service
-provider global au tableau des providers dans `config/app.php` :
+Dans Laravel 5.5 le service provider sera automatiquement enregistré.
+Dans les anciennes versions du framework, ajoutez simplement ce service provider
+au tableau des providers dans `config/app.php` :
 
 ```php
 // config/app.php
@@ -42,22 +43,6 @@ provider global au tableau des providers dans `config/app.php` :
 ];
 ```
 
-Sinon, vous pouvez choisir vous-mêmes les providers à utiliser (tous ces providers sont
-compris dans le provider global ci-dessus) :
-
-```php
-// config/app.php
-
-'provider' => [
-    //...
-    Axn\Illuminate\Database\DatabaseServiceProvider::class,
-    Axn\Illuminate\Database\MigrationServiceProvider::class,
-    Axn\Illuminate\Foundation\Providers\ArtisanServiceProvider::class,
-    Axn\Illuminate\View\ViewServiceProvider::class,
-    //...
-];
-```
-
 Eloquent
 --------