Merge pull request #20 from Adldap2/analysis-qMVOKz

Applied fixes from StyleCI

Author: stevebauman

src/AdldapAuthServiceProvider.php

@@ -31,7 +31,7 @@ public function boot()
         $this->mergeConfigFrom($auth, 'adldap_auth');
 
         // Extend Laravel authentication with Adldap driver.
-        Auth::extend('adldap', function($app) {
+        Auth::extend('adldap', function ($app) {
             return new AdldapAuthUserProvider($app['hash'], $app['config']['auth.model']);
         });
     }

src/AdldapAuthUserProvider.php

@@ -3,18 +3,18 @@
 namespace Adldap\Laravel;
 
 use Adldap\Laravel\Facades\Adldap;
-use Adldap\Schemas\ActiveDirectory;
 use Adldap\Models\User;
+use Adldap\Schemas\ActiveDirectory;
+use Illuminate\Auth\EloquentUserProvider;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Auth\EloquentUserProvider;
 
 class AdldapAuthUserProvider extends EloquentUserProvider
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function retrieveById($identifier)
     {
@@ -24,7 +24,7 @@ public function retrieveById($identifier)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function retrieveByToken($identifier, $token)
     {
@@ -34,7 +34,7 @@ public function retrieveByToken($identifier, $token)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function retrieveByCredentials(array $credentials)
     {
@@ -54,30 +54,30 @@ public function retrieveByCredentials(array $credentials)
         $user = $query->first();
 
         // If the user is an Adldap User model instance.
-        if($user instanceof User) {
+        if ($user instanceof User) {
             // Retrieve the users login attribute.
             $username = $user->{$this->getLoginAttribute()};
 
-            if(is_array($username)) {
+            if (is_array($username)) {
                 $username = Arr::get($username, 0);
             }
 
             // Get the password input array key.
             $key = $this->getPasswordKey();
 
             // Try to log the user in.
-            if($this->authenticate($username, $credentials[$key])) {
+            if ($this->authenticate($username, $credentials[$key])) {
                 // Login was successful, we'll create a new
                 // Laravel model with the Adldap user.
                 return $this->getModelFromAdldap($user, $credentials[$key]);
             }
         }
 
-        return null;
+        return;
     }
 
     /**
-     * Creates a local User from Active Directory
+     * Creates a local User from Active Directory.
      *
      * @param User   $user
      * @param string $password
@@ -105,7 +105,9 @@ protected function getModelFromAdldap(User $user, $password)
         $model = $this->createModel()->newQuery()->where([$key => $username])->first();
 
         // Create the model instance of it isn't found.
-        if(!$model) $model = $this->createModel();
+        if (!$model) {
+            $model = $this->createModel();
+        }
 
         // Set the username and password in case
         // of changes in active directory.
@@ -118,7 +120,7 @@ protected function getModelFromAdldap(User $user, $password)
         // attributes on the model.
         $model = $this->syncModelFromAdldap($user, $model);
 
-        if($this->getBindUserToModel()) {
+        if ($this->getBindUserToModel()) {
             $model = $this->bindAdldapToModel($user, $model);
         }
 
@@ -137,10 +139,10 @@ protected function syncModelFromAdldap(User $user, Authenticatable $model)
     {
         $attributes = $this->getSyncAttributes();
 
-        foreach($attributes as $modelField => $adField) {
+        foreach ($attributes as $modelField => $adField) {
             $adValue = $user->{$adField};
 
-            if(is_array($adValue)) {
+            if (is_array($adValue)) {
                 // If the AD Value is an array, we'll
                 // retrieve the first value.
                 $adValue = Arr::get($adValue, 0);
@@ -150,7 +152,7 @@ protected function syncModelFromAdldap(User $user, Authenticatable $model)
         }
 
         // Only save models that contain changes.
-        if($model instanceof Model && count($model->getDirty()) > 0) {
+        if ($model instanceof Model && count($model->getDirty()) > 0) {
             $model->save();
         }
 

src/AdldapServiceProvider.php

@@ -35,18 +35,17 @@ public function boot()
     public function register()
     {
         // Bind the Adldap instance to the IoC
-        $this->app->bind('adldap', function()
-        {
+        $this->app->bind('adldap', function () {
             $config = $this->app['config']->get('adldap');
 
             // Verify configuration
-            if(is_null($config)) {
+            if (is_null($config)) {
                 $message = 'Adldap configuration could not be found. Try re-publishing using `php artisan vendor:publish`.';
 
                 throw new ConfigurationMissingException($message);
             }
 
-            return new Adldap($config['connection_settings'], new $config['connection'], $config['auto_connect']);
+            return new Adldap($config['connection_settings'], new $config['connection'](), $config['auto_connect']);
         });
 
         // Bind the Adldap contract to the Adldap object

tests/AdldapTest.php

@@ -2,11 +2,11 @@
 
 namespace Adldap\Laravel\Tests;
 
-use Mockery;
-use Adldap\Models\User;
 use Adldap\Laravel\Facades\Adldap;
-use Illuminate\Support\Facades\Auth;
+use Adldap\Models\User;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Mockery;
 
 class AdldapTest extends FunctionalTestCase
 {
@@ -52,8 +52,8 @@ public function testAuthPasses()
 
         $rawAttributes = [
             'samaccountname' => ['jdoe'],
-            'mail' => ['jdoe@email.com'],
-            'cn' => ['John Doe'],
+            'mail'           => ['jdoe@email.com'],
+            'cn'             => ['John Doe'],
         ];
 
         $adUser = (new User([], $mockedBuilder))->setRawAttributes($rawAttributes);
@@ -122,8 +122,8 @@ public function testAuthFailsWhenUserFound()
 
         $rawAttributes = [
             'samaccountname' => ['jdoe'],
-            'mail' => ['jdoe@email.com'],
-            'cn' => ['John Doe'],
+            'mail'           => ['jdoe@email.com'],
+            'cn'             => ['John Doe'],
         ];
 
         $adUser = (new User([], $mockedBuilder))->setRawAttributes($rawAttributes);

tests/Models/User.php

@@ -4,10 +4,10 @@
 
 use Adldap\Laravel\Traits\AdldapUserModelTrait;
 use Illuminate\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Database\Eloquent\Model;
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {