Small tweaks and optimizations.

Author: stevebauman

src/AdldapServiceProvider.php

@@ -3,8 +3,6 @@
 namespace Adldap\Laravel;
 
 use Adldap\Adldap;
-use Adldap\Connections\Configuration;
-use Adldap\Connections\Manager;
 use Adldap\Connections\Provider;
 use Adldap\Contracts\AdldapInterface;
 use Adldap\Laravel\Exceptions\ConfigurationMissingException;
@@ -15,6 +13,8 @@ class AdldapServiceProvider extends ServiceProvider
 {
     /**
      * Run service provider boot operations.
+     *
+     * @return void
      */
     public function boot()
     {
@@ -29,6 +29,8 @@ public function boot()
 
     /**
      * Register the service provider.
+     *
+     * @return void
      */
     public function register()
     {
@@ -43,31 +45,7 @@ public function register()
                 throw new ConfigurationMissingException($message);
             }
 
-            // Create a new connection Manager.
-            $manager = new Manager();
-
-            // Retrieve the LDAP connections.
-            $connections = $config['connections'];
-
-            // Go through each connection and construct a Provider.
-            foreach ($connections as $name => $settings) {
-                $configuration = new Configuration($settings['connection_settings']);
-                $connection = new $settings['connection']();
-                $schema = new $settings['schema']();
-
-                // Construct a new connection Provider with its settings.
-                $provider = new Provider($configuration, $connection, $schema);
-
-                if ($settings['auto_connect'] === true) {
-                    // Try connecting to the provider if `auto_connect` is true.
-                    $provider->connect();
-                }
-
-                // Add the Provider to the Manager.
-                $manager->add($name, $provider);
-            }
-
-            return new Adldap($manager);
+            return $this->addProviders(new Adldap(), $config['connections']);
         });
 
         // Bind the Adldap contract to the Adldap object
@@ -84,4 +62,34 @@ public function provides()
     {
         return ['adldap'];
     }
+
+    /**
+     * Adds providers to the specified Adldap instance.
+     *
+     * @param Adldap $adldap
+     * @param array  $connections
+     *
+     * @return Adldap
+     * @throws \Adldap\Exceptions\ConnectionException
+     */
+    protected function addProviders(Adldap $adldap, array $connections = [])
+    {
+        // Go through each connection and construct a Provider.
+        foreach ($connections as $name => $settings) {
+            $connection = new $settings['connection']();
+            $schema = new $settings['schema']();
+
+            // Construct a new connection Provider with its settings.
+            $provider = new Provider($settings['connection_settings'], $connection, $schema);
+
+            if ($settings['auto_connect'] === true) {
+                // Try connecting to the provider if `auto_connect` is true.
+                $provider->connect();
+            }
+
+            $adldap->addProvider($name, $provider);
+        }
+
+        return $adldap;
+    }
 }

src/Facades/Adldap.php

@@ -7,9 +7,7 @@
 class Adldap extends Facade
 {
     /**
-     * Get the registered name of the component.
-     *
-     * @return string
+     * {@inheritdoc}
      */
     protected static function getFacadeAccessor()
     {

src/Middleware/WindowsAuthenticate.php

@@ -41,7 +41,6 @@ public function __construct(Guard $auth)
      */
     public function handle(Request $request, Closure $next)
     {
-        // If the user is already logged in, we don't need to reauthenticate.
         if (!$this->auth->check()) {
             // Retrieve the SSO login attribute.
             $auth = $this->getWindowsAuthAttribute();

src/Traits/ImportsUsers.php

@@ -37,9 +37,7 @@ protected function getModelFromAdldap(User $user, $password)
 
         // Make sure we retrieve the first username
         // result if it's an array.
-        if (is_array($username)) {
-            $username = Arr::get($username, 0);
-        }
+        $username = (is_array($username) ? Arr::get($username, 0) : $username);
 
         // Try to retrieve the model from the model key and AD username.
         $model = $this->createModel()->newQuery()->where([$key => $username])->first();
@@ -238,7 +236,6 @@ protected function getSchema()
      */
     protected function getAdldap($provider = null)
     {
-        /** @var \Adldap\Adldap $ad */
         $ad = Adldap::getFacadeRoot();
 
         if (is_null($provider)) {