Merge branch 'master' of https://github.com/Adldap2/Adldap2-Laravel

Author: stevebauman

docs/auth.md

@@ -470,22 +470,8 @@ namespace App\Rules;
 
 use Adldap\Laravel\Validation\Rules\Rule;
 
-class OnlyManagersAndAccountingRule extends Rule
+class OnlyManagersAndAccounting extends Rule
 {
-    /**
-     * The LDAP user.
-     *
-     * @var User
-     */
-    protected $user;
-    
-    /**
-     * The Eloquent model.
-     *
-     * @var Model|null
-     */
-    protected $model;
-    
     /**
      * Determines if the user is allowed to authenticate.
      *
@@ -510,7 +496,7 @@ To implement your new rule, you just need to insert it into your `config/adldap_
 ```php
 'rules' => [
 
-    App\Rules\OnlyManagersAndAccountingRule::class,
+    App\Rules\OnlyManagersAndAccounting::class,
 
 ],
 ```
@@ -530,22 +516,8 @@ namespace App\Rules;
 use Adldap\Models\User as LdapUser;
 use Adldap\Laravel\Validation\Rules\Rule;
 
-class AccountingRule extends Rule
+class IsAccountant extends Rule
 {
-    /**
-     * The LDAP user.
-     *
-     * @var User
-     */
-    protected $user;
-    
-    /**
-     * The Eloquent model.
-     *
-     * @var Model|null
-     */
-    protected $model;
-    
     /**
      * Determines if the user is allowed to authenticate.
      *

readme.md

@@ -7,8 +7,8 @@
 [![Latest Stable Version](https://img.shields.io/packagist/v/adldap2/adldap2-laravel.svg?style=flat-square)](https://packagist.org/packages/adldap2/adldap2-laravel)
 [![License](https://img.shields.io/packagist/l/adldap2/adldap2-laravel.svg?style=flat-square)](https://packagist.org/packages/adldap2/adldap2-laravel)
 
-Adldap2 - Laravel allows easy configuration, access, management and authentication to LDAP connections utilizing the root
-[Adldap2 Repository](http://www.github.com/Adldap2/Adldap2).
+Easy configuration, access, management and authentication to LDAP servers utilizing the root
+[Adldap2](http://www.github.com/Adldap2/Adldap2) repository.
 
 ## Requirements
 
@@ -74,30 +74,38 @@ Now you're all set!
 
 First, configure your LDAP connection in the `config/adldap.php` file.
 
-Then, you can perform all methods on your Adldap connection through its facade like so:
+Then, you can perform methods on your default connection through the `Adldap` facade like so:
 
 ```php
 use Adldap\Laravel\Facades\Adldap;
 
-// Finding a user.
+// Finding a user:
 $user = Adldap::search()->users()->find('john doe');
 
-// Searching for a user.
+// Searching for a user:
 $search = Adldap::search()->where('cn', '=', 'John Doe')->get();
 
 // Running an operation under a different connection:
 $users = Adldap::getProvider('other-connection')->search()->users()->get();
 
-// Creating a user.
+// Creating a user:
 $user = Adldap::make()->user([
     'cn' => 'John Doe',
 ]);
 
+// Saving a user:
 $user->save();
 ```
 
-Or you can inject the Adldap interface into your controllers, which gives
-you access to all of your LDAP connections and resources.
+If you do not specify an alternate connection using `getProvider()`, your
+`default` connection will be utilized for all methods.
+
+Upon performing operations without specifying a connection, your default
+connection will be connected to and bound automatically
+using your configured username and password.
+
+If you would prefer, you can also inject the Adldap interface into your controllers,
+which gives you access to all of your LDAP connections and resources as the facade.
 
 ```php
 use Adldap\AdldapInterface;
@@ -130,7 +138,19 @@ class UserController extends Controller
 
         return view('users.index', compact('users'));
     }
+    
+    /**
+     * Displays the specified LDAP user.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function show($id)
+    {
+        $user = $this->ldap->search()->findByGuid($id);
+        
+        return view('users.show', compact('user'));
+    }
 }
 ```
 
-To see more usage in detail, please visit the [Adldap2 Repository](http://github.com/Adldap2/Adldap2).
+To see more usage in detail, please visit the [Adldap2](http://github.com/Adldap2/Adldap2) repository.

src/Commands/Import.php

@@ -69,7 +69,6 @@ public function handle()
 
         Event::fire(new Synchronizing($this->user, $model));
 
-        // Synchronize LDAP attributes on the model.
         $this->sync($model);
 
         Event::fire(new Synchronized($this->user, $model));

src/Commands/SyncPassword.php

@@ -74,7 +74,7 @@ protected function applyPassword($password)
     /**
      * Determines if the current model requires a password update.
      *
-     * This checks if the model does not current have a
+     * This checks if the model does not currently have a
      * password, or if the password fails a hash check.
      *
      * @param string|null $password

src/Events/AuthenticatedModelTrashed.php

@@ -15,7 +15,7 @@ class AuthenticatedModelTrashed
     public $user;
 
     /**
-     * The authenticated LDAP users model.
+     * The trashed authenticated LDAP users model.
      *
      * @var Authenticatable
      */

src/Events/Authenticating.php

@@ -14,7 +14,7 @@ class Authenticating
     public $user;
 
     /**
-     * The username that is being authenticated.
+     * The username being used for authentication.
      *
      * @var string
      */