Fix tests and use adldap instance as singleton

Author: stevebauman

src/AdldapServiceProvider.php

@@ -13,13 +13,6 @@
 
 class AdldapServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
     /**
      * Run service provider boot operations.
      */
@@ -40,7 +33,7 @@ public function boot()
     public function register()
     {
         // Bind the Adldap instance to the IoC
-        $this->app->bind('adldap', function (Application $app) {
+        $this->app->singleton('adldap', function (Application $app) {
             $config = $app->make('config')->get('adldap');
 
             // Verify configuration exists.
@@ -58,12 +51,12 @@ public function register()
 
             // Go through each connection and construct a Provider.
             foreach ($connections as $name => $settings) {
-                $ldap = new $settings['connection']();
                 $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($ldap, $configuration, $schema);
+                $provider = new Provider($configuration, $connection, $schema);
 
                 if ($settings['auto_connect'] === true) {
                     // Try connecting to the provider if `auto_connect` is true.
@@ -79,7 +72,7 @@ public function register()
 
         // Bind the Adldap contract to the Adldap object
         // in the IoC for dependency injection.
-        $this->app->bind(AdldapInterface::class, 'adldap');
+        $this->app->singleton(AdldapInterface::class, 'adldap');
     }
 
     /**

src/Config/config.php

@@ -39,6 +39,8 @@
             |
             | The connection class to use to run operations on.
             |
+            | You can also set this option to `null` to use the default connection class.
+            |
             | Custom connection classes must implement \Adldap\Contracts\Connections\ConnectionInterface
             |
             */
@@ -52,6 +54,8 @@
             |
             | The schema class to use for retrieving attributes and generating models.
             |
+            | You can also set this option to `null` to use the default schema class.
+            |
             | Custom schema classes must implement \Adldap\Contracts\Schemas\SchemaInterface
             |
             */
@@ -187,18 +191,6 @@
                 'use_ssl' => false,
                 'use_tls' => false,
 
-                /*
-                |--------------------------------------------------------------------------
-                | SSO (Single Sign On)
-                |--------------------------------------------------------------------------
-                |
-                | If you enable single sign on, be sure you've properly set it up
-                | on your server before hand.
-                |
-                */
-
-                'use_sso' => false,
-
             ],
 
         ],