Skip to content

Commit

Permalink
Add config merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Roussel Xavier committed Jan 20, 2016
1 parent a3fa899 commit 539b813
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/LdapServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down

0 comments on commit 539b813

Please sign in to comment.