Small tweaks.

Author: stevebauman

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "adldap2/adldap2-laravel",
-    "description": "Adldap2 for Laravel 5",
+    "description": "Adldap2 for Laravel 5.",
     "keywords": ["adldap", "adldap2", "ldap", "laravel"],
     "license": "MIT",
     "type": "project",

src/AdldapAuthServiceProvider.php

@@ -23,12 +23,14 @@ public function boot()
     {
         $auth = __DIR__.'/Config/auth.php';
 
-        $this->mergeConfigFrom($auth, 'adldap_auth');
-
+        // Add publishable configuration.
         $this->publishes([
             $auth => config_path('adldap_auth.php'),
         ], 'adldap');
 
+        $this->mergeConfigFrom($auth, 'adldap_auth');
+
+        // Extend Laravel authentication with Adldap driver.
         Auth::extend('adldap', function($app) {
             return new AdldapAuthUserProvider($app['hash'], $app['config']['auth.model']);
         });

src/AdldapAuthUserProvider.php

@@ -52,19 +52,19 @@ public function retrieveByCredentials(array $credentials)
         // Retrieve the first user result
         $user = $query->first();
 
-        // If the user is an Adldap user
+        // If the user is an Adldap User model instance.
         if($user instanceof User) {
-            // Retrieve the users login attribute
+            // Retrieve the users login attribute.
             $username = $user->{$this->getLoginAttribute()};
 
             if(is_array($username)) {
                 $username = Arr::get($username, 0);
             }
 
-            // Try to log the user in
+            // Try to log the user in.
             if($this->authenticate($username, $credentials['password'])) {
                 // Login was successful, we'll create a new
-                // Laravel model with the Adldap user
+                // Laravel model with the Adldap user.
                 return $this->getModelFromAdldap($user, $credentials['password']);
             }
         }
@@ -141,7 +141,7 @@ protected function syncModelFromAdldap(User $user, Authenticatable $model)
             $model->{$modelField} = $adValue;
         }
 
-        // Only save models that contain changes
+        // Only save models that contain changes.
         if(count($model->getDirty()) > 0) {
             $model->save();
         }

src/AdldapServiceProvider.php

@@ -22,11 +22,11 @@ public function boot()
     {
         $config = __DIR__.'/Config/config.php';
 
-        $this->mergeConfigFrom($config, 'adldap');
-
         $this->publishes([
             $config => config_path('adldap.php'),
         ], 'adldap');
+
+        $this->mergeConfigFrom($config, 'adldap');
     }
 
     /**
@@ -49,7 +49,8 @@ public function register()
             return new Adldap($config['connection_settings'], new $config['connection'], $config['auto_connect']);
         });
 
-        // Bind the Adldap contract to the Adldap implementation
+        // Bind the Adldap contract to the Adldap object
+        // in the IoC for dependency injection.
         $this->app->bind('Adldap\Contracts\Adldap', 'adldap');
     }