Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Commit 8519b41

Browse files
committed
Fix conflicts
2 parents eb79617 + 5d92daa commit 8519b41

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Adldap2 - Laravel
22

3-
[![Build Status](https://img.shields.io/travis/Adldap2/Adldap2-laravel.svg?style=flat-square)](https://travis-ci.org/Adldap2/Adldap2-laravel)
3+
[![Build Status](https://img.shields.io/travis/Adldap2/Adldap2-Laravel.svg?style=flat-square)](https://travis-ci.org/Adldap2/Adldap2-Laravel)
44
[![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)
55
[![Total Downloads](https://img.shields.io/packagist/dt/adldap2/adldap2-laravel.svg?style=flat-square)](https://packagist.org/packages/adldap2/adldap2-laravel)
66
[![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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function boot()
3131
$this->mergeConfigFrom($auth, 'adldap_auth');
3232

3333
// Extend Laravel authentication with Adldap driver.
34-
Auth::extend('adldap', function($app) {
34+
Auth::extend('adldap', function ($app) {
3535
return new AdldapAuthUserProvider($app['hash'], $app['config']['auth.model']);
3636
});
3737
}

tests/AdldapTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Adldap\Laravel\Tests;
44

5-
use Mockery;
6-
use Adldap\Models\User;
75
use Adldap\Laravel\Facades\Adldap;
8-
use Illuminate\Support\Facades\Auth;
6+
use Adldap\Models\User;
97
use Illuminate\Support\Facades\App;
8+
use Illuminate\Support\Facades\Auth;
9+
use Mockery;
1010

1111
class AdldapTest extends FunctionalTestCase
1212
{
@@ -52,8 +52,8 @@ public function testAuthPasses()
5252

5353
$rawAttributes = [
5454
'samaccountname' => ['jdoe'],
55-
'mail' => ['[email protected]'],
56-
'cn' => ['John Doe'],
55+
'mail' => ['[email protected]'],
56+
'cn' => ['John Doe'],
5757
];
5858

5959
$adUser = (new User([], $mockedBuilder))->setRawAttributes($rawAttributes);
@@ -122,8 +122,8 @@ public function testAuthFailsWhenUserFound()
122122

123123
$rawAttributes = [
124124
'samaccountname' => ['jdoe'],
125-
'mail' => ['[email protected]'],
126-
'cn' => ['John Doe'],
125+
'mail' => ['[email protected]'],
126+
'cn' => ['John Doe'],
127127
];
128128

129129
$adUser = (new User([], $mockedBuilder))->setRawAttributes($rawAttributes);

tests/Models/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use Adldap\Laravel\Traits\AdldapUserModelTrait;
66
use Illuminate\Auth\Authenticatable;
7-
use Illuminate\Database\Eloquent\Model;
87
use Illuminate\Auth\Passwords\CanResetPassword;
98
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
109
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
10+
use Illuminate\Database\Eloquent\Model;
1111

1212
class User extends Model implements AuthenticatableContract, CanResetPasswordContract
1313
{

0 commit comments

Comments
 (0)