Fix conflicts

Author: stevebauman

README.md

@@ -1,6 +1,6 @@
 # Adldap2 - Laravel
 
-[![Build Status](https://img.shields.io/travis/Adldap2/Adldap2-laravel.svg?style=flat-square)](https://travis-ci.org/Adldap2/Adldap2-laravel)
+[![Build Status](https://img.shields.io/travis/Adldap2/Adldap2-Laravel.svg?style=flat-square)](https://travis-ci.org/Adldap2/Adldap2-Laravel)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/Adldap2/Adldap2-laravel/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/Adldap2/Adldap2-laravel/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/adldap2/adldap2-laravel.svg?style=flat-square)](https://packagist.org/packages/adldap2/adldap2-laravel)
 [![Latest Stable Version](https://img.shields.io/packagist/v/adldap2/adldap2-laravel.svg?style=flat-square)](https://packagist.org/packages/adldap2/adldap2-laravel)

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']);
         });
     }

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
 {