Move resolver into separate namespace

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -4,8 +4,8 @@
 
 use InvalidArgumentException;
 use Adldap\Laravel\Facades\Adldap;
-use Adldap\Laravel\Auth\Resolver;
-use Adldap\Laravel\Auth\ResolverInterface;
+use Adldap\Laravel\Resolvers\UserResolver;
+use Adldap\Laravel\Resolvers\ResolverInterface;
 use Adldap\Laravel\Commands\Console\Import;
 use Adldap\Laravel\Auth\DatabaseUserProvider;
 use Adldap\Laravel\Auth\NoDatabaseUserProvider;
@@ -169,7 +169,7 @@ protected function userProvider()
      */
     protected function resolver()
     {
-        return Config::get('adldap_auth.resolver', Resolver::class);
+        return Config::get('adldap_auth.resolver', UserResolver::class);
     }
 
     /**

src/Auth/DatabaseUserProvider.php

@@ -3,9 +3,9 @@
 namespace Adldap\Laravel\Auth;
 
 use Adldap\Models\User;
+use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Commands\Import;
 use Adldap\Laravel\Commands\SyncPassword;
-use Adldap\Laravel\Facades\Resolver as UserResolver;
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
 use Adldap\Laravel\Events\AuthenticatedWithCredentials;
 use Illuminate\Support\Facades\Bus;
@@ -94,7 +94,7 @@ public function updateRememberToken(Authenticatable $user, $token)
     public function retrieveByCredentials(array $credentials)
     {
         // Retrieve the LDAP user who is authenticating.
-        $user = UserResolver::byCredentials($credentials);
+        $user = Resolver::byCredentials($credentials);
 
         if ($user instanceof User) {
             // Set the currently authenticating LDAP user.
@@ -122,7 +122,7 @@ public function validateCredentials(Authenticatable $model, array $credentials)
         // they pass authentication before going further.
         if (
             $this->user instanceof User &&
-            UserResolver::authenticate($this->user, $credentials)
+            Resolver::authenticate($this->user, $credentials)
         ) {
             Event::fire(new AuthenticatedWithCredentials($this->user, $model));
 

src/Config/auth.php

@@ -46,11 +46,11 @@
     |
     | Custom resolvers must implement the following interface:
     |
-    |   Adldap\Laravel\Auth\ResolverInterface
+    |   Adldap\Laravel\Resolver\ResolverInterface
     |
     */
 
-    'resolver' => Adldap\Laravel\Auth\Resolver::class,
+    'resolver' => Adldap\Laravel\Resolvers\UserResolver::class,
 
     /*
     |--------------------------------------------------------------------------

src/Facades/Resolver.php

@@ -2,8 +2,8 @@
 
 namespace Adldap\Laravel\Facades;
 
-use Adldap\Laravel\Auth\ResolverInterface;
 use Illuminate\Support\Facades\Facade;
+use Adldap\Laravel\Resolvers\ResolverInterface;
 
 class Resolver extends Facade
 {

src/Auth/ResolverInterface.php renamed to src/Resolvers/ResolverInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Adldap\Laravel\Auth;
+namespace Adldap\Laravel\Resolvers;
 
 use Adldap\Models\User;
 use Adldap\Connections\ProviderInterface;

src/Auth/Resolver.php renamed to src/Resolvers/UserResolver.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Adldap\Laravel\Auth;
+namespace Adldap\Laravel\Resolvers;
 
 use Adldap\Models\User;
 use Adldap\Connections\ProviderInterface;
 use Illuminate\Contracts\Auth\Authenticatable;
 
-class Resolver implements ResolverInterface
+class UserResolver implements ResolverInterface
 {
     /**
      * The LDAP connection provider.