From 539b813ce31147f4fd33d2bc765c97789f6e291a Mon Sep 17 00:00:00 2001
From: Roussel Xavier <xavier.roussel@uvsq.fr>
Date: Wed, 20 Jan 2016 15:22:12 +0100
Subject: [PATCH] Add config merge

---
 src/LdapServiceProvider.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/LdapServiceProvider.php b/src/LdapServiceProvider.php
index 47c4f4b..eecd988 100644
--- a/src/LdapServiceProvider.php
+++ b/src/LdapServiceProvider.php
@@ -20,9 +20,13 @@ class LdapServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
+        $config = __DIR__ . '/config/ldap.php';
+        
 		$this->publishes([
-            __DIR__ . '/config/ldap.php' => config_path('ldap.php'),
-        ]);
+            $config => config_path('ldap.php'),
+        ], 'ldap');
+
+        $this->mergeConfigFrom($config, 'ldap');
 
 		Auth::provider('ldap', function ($app, array $config) {
 			return new LdapAuthUserProvider($app['hash'], $config['model']);