Apply fixes from StyleCI

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -2,19 +2,19 @@
 
 namespace Adldap\Laravel;
 
-use RuntimeException;
 use Adldap\AdldapInterface;
-use Adldap\Laravel\Resolvers\UserResolver;
-use Adldap\Laravel\Resolvers\ResolverInterface;
-use Adldap\Laravel\Commands\Console\Import;
 use Adldap\Laravel\Auth\DatabaseUserProvider;
+use Adldap\Laravel\Commands\Console\Import;
+use Adldap\Laravel\Resolvers\ResolverInterface;
+use Adldap\Laravel\Resolvers\UserResolver;
+use Illuminate\Auth\Events\Authenticated;
+use Illuminate\Auth\Events\Login;
+use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Contracts\Hashing\Hasher;
-use Illuminate\Auth\Events\Login;
-use Illuminate\Auth\Events\Authenticated;
+use RuntimeException;
 
 class AdldapAuthServiceProvider extends ServiceProvider
 {
@@ -31,7 +31,7 @@ public function boot()
         });
 
         if ($this->app->runningInConsole()) {
-            $config = __DIR__ . '/Config/auth.php';
+            $config = __DIR__.'/Config/auth.php';
 
             $this->publishes([
                 $config => config_path('ldap_auth.php'),
@@ -78,7 +78,7 @@ public function register()
      * @param array  $config
      *
      * @throws RuntimeException
-     * 
+     *
      * @return \Illuminate\Contracts\Auth\UserProvider
      */
     protected function makeUserProvider(Hasher $hasher, array $config)
@@ -92,16 +92,16 @@ protected function makeUserProvider(Hasher $hasher, array $config)
             // otherwise we will try to use the providers config array.
             $model = Config::get('ldap_auth.model') ?? array_get($config, 'model');
 
-            if (! $model) {
+            if (!$model) {
                 throw new RuntimeException(
                     "No model is configured. You must configure a model to use with the {$provider}."
                 );
             }
 
             return new $provider($hasher, $model);
         }
-        
-        return new $provider;
+
+        return new $provider();
     }
 
     /**

src/AdldapServiceProvider.php

@@ -5,8 +5,8 @@
 use Adldap\Adldap;
 use Adldap\AdldapException;
 use Adldap\AdldapInterface;
-use Adldap\Connections\Provider;
 use Adldap\Connections\ConnectionInterface;
+use Adldap\Connections\Provider;
 use Illuminate\Container\Container;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
@@ -38,7 +38,7 @@ public function boot()
         }
 
         if ($this->app->runningInConsole()) {
-            $config = __DIR__ . '/Config/config.php';
+            $config = __DIR__.'/Config/config.php';
 
             $this->publishes([
                 $config => config_path('ldap.php'),

src/Auth/DatabaseUserProvider.php

@@ -2,21 +2,21 @@
 
 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\Traits\ValidatesUsers;
-use Adldap\Laravel\Events\Imported;
+use Adldap\Laravel\Events\AuthenticatedWithCredentials;
 use Adldap\Laravel\Events\AuthenticationRejected;
 use Adldap\Laravel\Events\AuthenticationSuccessful;
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
-use Adldap\Laravel\Events\AuthenticatedWithCredentials;
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Config;
+use Adldap\Laravel\Events\Imported;
+use Adldap\Laravel\Facades\Resolver;
+use Adldap\Laravel\Traits\ValidatesUsers;
+use Adldap\Models\User;
 use Illuminate\Auth\EloquentUserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Event;
 
 class DatabaseUserProvider extends EloquentUserProvider
 {

src/Auth/NoDatabaseUserProvider.php

@@ -2,15 +2,15 @@
 
 namespace Adldap\Laravel\Auth;
 
-use Adldap\Laravel\Facades\Resolver;
-use Adldap\Laravel\Traits\ValidatesUsers;
+use Adldap\Laravel\Events\AuthenticatedWithCredentials;
 use Adldap\Laravel\Events\AuthenticationRejected;
 use Adldap\Laravel\Events\AuthenticationSuccessful;
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
-use Adldap\Laravel\Events\AuthenticatedWithCredentials;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Contracts\Auth\UserProvider;
+use Adldap\Laravel\Facades\Resolver;
+use Adldap\Laravel\Traits\ValidatesUsers;
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Support\Facades\Event;
 
 class NoDatabaseUserProvider implements UserProvider
 {
@@ -35,7 +35,6 @@ public function retrieveByToken($identifier, $token)
     {
         // We can't retrieve LDAP users via remember
         // token, as we have nowhere to store them.
-        return;
     }
 
     /**

src/Commands/Console/Import.php

@@ -2,19 +2,19 @@
 
 namespace Adldap\Laravel\Commands\Console;
 
-use Exception;
-use RuntimeException;
-use UnexpectedValueException;
-use Adldap\Models\User;
+use Adldap\Laravel\Commands\Import as ImportUser;
+use Adldap\Laravel\Commands\SyncPassword;
 use Adldap\Laravel\Events\Imported;
 use Adldap\Laravel\Facades\Resolver;
-use Adldap\Laravel\Commands\SyncPassword;
-use Adldap\Laravel\Commands\Import as ImportUser;
+use Adldap\Models\User;
+use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Event;
+use RuntimeException;
+use UnexpectedValueException;
 
 class Import extends Command
 {
@@ -47,10 +47,10 @@ class Import extends Command
     /**
      * Execute the console command.
      *
-     * @return void
-     *
      * @throws RuntimeException
      * @throws \Adldap\Models\ModelNotFoundException
+     *
+     * @return void
      */
     public function handle()
     {
@@ -59,8 +59,8 @@ public function handle()
         $count = count($users);
 
         if ($count === 0) {
-            throw new RuntimeException("There were no users found to import.");
-        } else if ($count === 1) {
+            throw new RuntimeException('There were no users found to import.');
+        } elseif ($count === 1) {
             $this->info("Found user '{$users[0]->getCommonName()}'.");
         } else {
             $this->info("Found {$count} user(s).");
@@ -74,14 +74,14 @@ public function handle()
         }
 
         if (
-            ! $this->input->isInteractive() ||
+            !$this->input->isInteractive() ||
             $this->confirm('Would you like these users to be imported / synchronized?', $default = true)
         ) {
             $imported = $this->import($users);
 
             $this->info("Successfully imported / synchronized {$imported} user(s).");
         } else {
-            $this->info("Okay, no users were imported / synchronized.");
+            $this->info('Okay, no users were imported / synchronized.');
         }
     }
 
@@ -151,9 +151,9 @@ public function display(array $users = [])
 
         array_map(function (User $user) use (&$data) {
             $data[] = [
-                'name' => $user->getCommonName(),
+                'name'         => $user->getCommonName(),
                 'account_name' => $user->getAccountName(),
-                'upn' => $user->getUserPrincipalName(),
+                'upn'          => $user->getUserPrincipalName(),
             ];
         }, $users);
 
@@ -195,9 +195,9 @@ public function isRestoring() : bool
     /**
      * Retrieves users to be imported.
      *
-     * @return array
-     *
      * @throws \Adldap\Models\ModelNotFoundException
+     *
+     * @return array
      */
     public function getUsers() : array
     {
@@ -285,15 +285,15 @@ protected function restore(User $user, Model $model)
      * @param User  $user
      * @param Model $model
      *
-     * @return void
-     *
      * @throws Exception
+     *
+     * @return void
      */
     protected function delete(User $user, Model $model)
     {
         if (
             $this->isUsingSoftDeletes($model) &&
-            ! $model->trashed() &&
+            !$model->trashed() &&
             $user->isDisabled()
         ) {
             // If deleting is enabled, the model supports soft deletes, the model
@@ -316,19 +316,19 @@ protected function delete(User $user, Model $model)
      */
     protected function model() : Model
     {
-        if (! $this->model) {
+        if (!$this->model) {
             $this->model = $this->option('model') ?? Config::get('ldap_auth.model') ?: $this->determineModel();
         }
 
-        return new $this->model;
+        return new $this->model();
     }
 
     /**
      * Retrieves the model by checking the configured LDAP authentication providers.
      *
-     * @return string
-     *
      * @throws UnexpectedValueException
+     *
+     * @return string
      */
     protected function determineModel()
     {

src/Commands/Import.php

@@ -2,15 +2,15 @@
 
 namespace Adldap\Laravel\Commands;
 
-use UnexpectedValueException;
-use Adldap\Models\User;
-use Adldap\Laravel\Facades\Resolver;
 use Adldap\Laravel\Events\Importing;
 use Adldap\Laravel\Events\Synchronized;
 use Adldap\Laravel\Events\Synchronizing;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Config;
+use Adldap\Laravel\Facades\Resolver;
+use Adldap\Models\User;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Event;
+use UnexpectedValueException;
 
 class Import
 {
@@ -69,7 +69,7 @@ public function handle()
         // we'll create a new one for them.
         $model = $this->findUser() ?: $this->model->newInstance();
 
-        if (! $model->exists) {
+        if (!$model->exists) {
             Event::dispatch(new Importing($this->user, $model));
         }
 
@@ -85,9 +85,9 @@ public function handle()
     /**
      * Retrieves an eloquent user by their GUID or their username.
      *
-     * @return Model|null
-     *
      * @throws UnexpectedValueException
+     *
+     * @return Model|null
      */
     protected function findUser()
     {
@@ -148,9 +148,9 @@ protected function sync(Model $model)
     /**
      * Returns the LDAP users configured username.
      *
-     * @return string
-     *
      * @throws UnexpectedValueException
+     *
+     * @return string
      */
     protected function getUserUsername()
     {
@@ -170,9 +170,9 @@ protected function getUserUsername()
     /**
      * Returns the LDAP users object GUID.
      *
-     * @return string
-     *
      * @throws UnexpectedValueException
+     *
+     * @return string
      */
     protected function getUserObjectGuid()
     {
@@ -210,7 +210,7 @@ protected function getLdapSyncAttributes()
     {
         return Config::get('ldap_auth.sync_attributes', [
             'email' => 'userprincipalname',
-            'name' => 'cn',
+            'name'  => 'cn',
         ]);
     }
 }

src/Commands/SyncPassword.php

@@ -2,10 +2,10 @@
 
 namespace Adldap\Laravel\Commands;
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 class SyncPassword
 {
@@ -86,7 +86,7 @@ protected function passwordNeedsUpdate($password = null) : bool
         $current = $this->currentModelPassword();
 
         if ($current !== null && $this->canSync()) {
-            return ! Hash::check($password, $current);
+            return !Hash::check($password, $current);
         }
 
         return is_null($current);
@@ -99,7 +99,7 @@ protected function passwordNeedsUpdate($password = null) : bool
      */
     protected function hasPasswordColumn() : bool
     {
-        return ! is_null($this->column());
+        return !is_null($this->column());
     }
 
     /**

src/Commands/UserImportScope.php

@@ -3,9 +3,9 @@
 namespace Adldap\Laravel\Commands;
 
 use Adldap\Laravel\Facades\Resolver;
-use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
 
 class UserImportScope implements Scope
 {