Properly check for attribute handler

- #560

(cherry picked from commit f5ff704)

Author: stevebauman

src/Commands/Import.php

@@ -3,7 +3,6 @@
 namespace Adldap\Laravel\Commands;
 
 use Adldap\Models\User;
-use Adldap\AdldapException;
 use Adldap\Laravel\Events\Importing;
 use Adldap\Laravel\Events\Synchronized;
 use Adldap\Laravel\Events\Synchronizing;
@@ -53,8 +52,6 @@ public function __construct(User $user, Model $model, array $credentials = [])
      * Imports the current LDAP user.
      *
      * @return Model
-     *
-     * @throws AdldapException
      */
     public function handle()
     {
@@ -110,8 +107,6 @@ protected function findByCredentials()
      *
      * @param Model $model
      *
-     * @throws AdldapException
-     *
      * @return void
      */
     protected function sync(Model $model)
@@ -122,18 +117,15 @@ protected function sync(Model $model)
         ]);
 
         foreach ($toSync as $modelField => $ldapField) {
-            // If the field is a loaded class, we can
-            // assume it's an attribute handler.
-            if (class_exists($ldapField)) {
+            // If the field is a loaded class and contains a `handle()` method,
+            // we need to construct the attribute handler.
+            if (class_exists($ldapField) && method_exists($ldapField, 'handle')) {
                 // We will construct the attribute handler using Laravel's
                 // IoC to allow developers to utilize application
                 // dependencies in the constructor.
+                /** @var mixed $handler */
                 $handler = app($ldapField);
 
-                if (! method_exists($handler, 'handle')) {
-                    throw new AdldapException("A public 'handle()' method must be defined when using an attribute handler.");
-                }
-
                 $handler->handle($this->user, $model);
             } else {
                 $model->{$modelField} = $this->user->getFirstAttribute($ldapField);

src/Listeners/BindsLdapUserModel.php

@@ -5,9 +5,9 @@
 use Adldap\Laravel\Auth\Provider;
 use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Traits\HasLdapUser;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Auth\Events\Authenticated;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Support\Facades\Auth;
 
 class BindsLdapUserModel
 {

tests/DatabaseProviderTest.php

@@ -103,11 +103,8 @@ public function attribute_handlers_are_used()
         $this->assertEquals('handled', $user->name);
     }
 
-    /**
-     * @test
-     * @expectedException \Adldap\AdldapException
-     */
-    public function invalid_attribute_handlers_throw_exception()
+    /** @test */
+    public function invalid_attribute_handlers_does_not_throw_exception()
     {
         // Inserting an invalid attribute handler that
         // does not contain a `handle` method.
@@ -118,11 +115,9 @@ public function invalid_attribute_handlers_throw_exception()
             'userprincipalname'  => '[email protected]',
         ]);
 
-        $model = new EloquentUser();
-
-        $importer = new Import($user, $model);
+        $importer = new Import($user, new EloquentUser());
 
-        $importer->handle();
+        $this->assertInstanceOf(EloquentUser::class, $importer->handle());
     }
 
     /** @test */