Merge pull request #739 from Adldap2/analysis-8mxW5D

Apply fixes from StyleCI

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -2,19 +2,19 @@
 
 namespace Adldap\Laravel;
 
+use RuntimeException;
 use Adldap\AdldapInterface;
-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\Config;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
-use RuntimeException;
+use Illuminate\Contracts\Hashing\Hasher;
+use Illuminate\Auth\Events\Authenticated;
+use Adldap\Laravel\Resolvers\UserResolver;
+use Adldap\Laravel\Commands\Console\Import;
+use Adldap\Laravel\Auth\DatabaseUserProvider;
+use Adldap\Laravel\Resolvers\ResolverInterface;
 
 class AdldapAuthServiceProvider extends ServiceProvider
 {
@@ -92,7 +92,7 @@ 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}."
                 );

src/AdldapServiceProvider.php

@@ -5,11 +5,11 @@
 use Adldap\Adldap;
 use Adldap\AdldapException;
 use Adldap\AdldapInterface;
-use Adldap\Connections\ConnectionInterface;
 use Adldap\Connections\Provider;
 use Illuminate\Container\Container;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
+use Adldap\Connections\ConnectionInterface;
 
 class AdldapServiceProvider extends ServiceProvider
 {

src/Auth/DatabaseUserProvider.php

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

src/Auth/NoDatabaseUserProvider.php

@@ -2,15 +2,15 @@
 
 namespace Adldap\Laravel\Auth;
 
-use Adldap\Laravel\Events\AuthenticatedWithCredentials;
-use Adldap\Laravel\Events\AuthenticationRejected;
-use Adldap\Laravel\Events\AuthenticationSuccessful;
-use Adldap\Laravel\Events\DiscoveredWithCredentials;
 use Adldap\Laravel\Facades\Resolver;
+use Illuminate\Support\Facades\Event;
 use Adldap\Laravel\Traits\ValidatesUsers;
-use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
-use Illuminate\Support\Facades\Event;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Adldap\Laravel\Events\AuthenticationRejected;
+use Adldap\Laravel\Events\AuthenticationSuccessful;
+use Adldap\Laravel\Events\DiscoveredWithCredentials;
+use Adldap\Laravel\Events\AuthenticatedWithCredentials;
 
 class NoDatabaseUserProvider implements UserProvider
 {

src/Commands/Console/Import.php

@@ -2,19 +2,19 @@
 
 namespace Adldap\Laravel\Commands\Console;
 
-use Adldap\Laravel\Commands\Import as ImportUser;
-use Adldap\Laravel\Commands\SyncPassword;
-use Adldap\Laravel\Events\Imported;
-use Adldap\Laravel\Facades\Resolver;
-use Adldap\Models\User;
 use Exception;
+use RuntimeException;
+use Adldap\Models\User;
+use UnexpectedValueException;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Model;
+use Adldap\Laravel\Events\Imported;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Config;
+use Adldap\Laravel\Facades\Resolver;
 use Illuminate\Support\Facades\Event;
-use RuntimeException;
-use UnexpectedValueException;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Database\Eloquent\Model;
+use Adldap\Laravel\Commands\SyncPassword;
+use Adldap\Laravel\Commands\Import as ImportUser;
 
 class Import extends Command
 {
@@ -74,7 +74,7 @@ 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);
@@ -167,7 +167,7 @@ public function display(array $users = [])
      */
     public function isLogging() : bool
     {
-        return !$this->option('no-log');
+        return ! $this->option('no-log');
     }
 
     /**
@@ -293,7 +293,7 @@ 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,7 +316,7 @@ 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();
         }
 

src/Commands/Import.php

@@ -2,15 +2,15 @@
 
 namespace Adldap\Laravel\Commands;
 
+use Adldap\Models\User;
+use UnexpectedValueException;
 use Adldap\Laravel\Events\Importing;
-use Adldap\Laravel\Events\Synchronized;
-use Adldap\Laravel\Events\Synchronizing;
 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;
+use Illuminate\Support\Facades\Config;
+use Adldap\Laravel\Events\Synchronized;
+use Illuminate\Database\Eloquent\Model;
+use Adldap\Laravel\Events\Synchronizing;
 
 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));
         }
 

src/Commands/SyncPassword.php

@@ -2,10 +2,10 @@
 
 namespace Adldap\Laravel\Commands;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Database\Eloquent\Model;
 
 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\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Database\Eloquent\Builder;
 
 class UserImportScope implements Scope
 {

src/Facades/Resolver.php

@@ -2,8 +2,8 @@
 
 namespace Adldap\Laravel\Facades;
 
-use Adldap\Laravel\Resolvers\ResolverInterface;
 use Illuminate\Support\Facades\Facade;
+use Adldap\Laravel\Resolvers\ResolverInterface;
 
 /**
  * @method static void setConnection(string $connection)

src/Listeners/BindsLdapUserModel.php

@@ -2,11 +2,11 @@
 
 namespace Adldap\Laravel\Listeners;
 
-use Adldap\Laravel\Auth\DatabaseUserProvider;
 use Adldap\Laravel\Facades\Resolver;
+use Illuminate\Support\Facades\Auth;
 use Adldap\Laravel\Traits\HasLdapUser;
+use Adldap\Laravel\Auth\DatabaseUserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Support\Facades\Auth;
 
 class BindsLdapUserModel
 {