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

Commit 9d2e2c7

Browse files
authored
Merge pull request #816 from Adldap2/analysis-4xlgjE
Apply fixes from StyleCI
2 parents 0a375bb + 78cfda3 commit 9d2e2c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+164
-164
lines changed

src/AdldapAuthServiceProvider.php

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

33
namespace Adldap\Laravel;
44

5-
use RuntimeException;
65
use Adldap\AdldapInterface;
7-
use Illuminate\Support\Arr;
6+
use Adldap\Laravel\Auth\DatabaseUserProvider;
7+
use Adldap\Laravel\Commands\Console\Import;
8+
use Adldap\Laravel\Resolvers\ResolverInterface;
9+
use Adldap\Laravel\Resolvers\UserResolver;
10+
use Illuminate\Auth\Events\Authenticated;
811
use Illuminate\Auth\Events\Login;
12+
use Illuminate\Contracts\Hashing\Hasher;
13+
use Illuminate\Support\Arr;
914
use Illuminate\Support\Facades\Auth;
10-
use Illuminate\Support\Facades\Event;
1115
use Illuminate\Support\Facades\Config;
16+
use Illuminate\Support\Facades\Event;
1217
use Illuminate\Support\ServiceProvider;
13-
use Illuminate\Contracts\Hashing\Hasher;
14-
use Illuminate\Auth\Events\Authenticated;
15-
use Adldap\Laravel\Resolvers\UserResolver;
16-
use Adldap\Laravel\Commands\Console\Import;
17-
use Adldap\Laravel\Auth\DatabaseUserProvider;
18-
use Adldap\Laravel\Resolvers\ResolverInterface;
18+
use RuntimeException;
1919

2020
class AdldapAuthServiceProvider extends ServiceProvider
2121
{

src/AdldapServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
use Adldap\Adldap;
66
use Adldap\AdldapException;
77
use Adldap\AdldapInterface;
8-
use Illuminate\Support\Str;
8+
use Adldap\Connections\ConnectionInterface;
99
use Adldap\Connections\Provider;
1010
use Illuminate\Container\Container;
1111
use Illuminate\Support\Facades\Config;
1212
use Illuminate\Support\ServiceProvider;
13-
use Adldap\Connections\ConnectionInterface;
13+
use Illuminate\Support\Str;
1414

1515
class AdldapServiceProvider extends ServiceProvider
1616
{

src/Auth/DatabaseUserProvider.php

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

33
namespace Adldap\Laravel\Auth;
44

5-
use Adldap\Models\User;
65
use Adldap\Laravel\Commands\Import;
6+
use Adldap\Laravel\Commands\SyncPassword;
7+
use Adldap\Laravel\Events\AuthenticatedWithCredentials;
8+
use Adldap\Laravel\Events\AuthenticationRejected;
9+
use Adldap\Laravel\Events\AuthenticationSuccessful;
10+
use Adldap\Laravel\Events\DiscoveredWithCredentials;
711
use Adldap\Laravel\Events\Imported;
8-
use Illuminate\Support\Facades\Bus;
912
use Adldap\Laravel\Facades\Resolver;
10-
use Illuminate\Support\Facades\Event;
11-
use Illuminate\Support\Facades\Config;
12-
use Adldap\Laravel\Commands\SyncPassword;
1313
use Adldap\Laravel\Traits\ValidatesUsers;
14+
use Adldap\Models\User;
1415
use Illuminate\Auth\EloquentUserProvider;
1516
use Illuminate\Contracts\Auth\Authenticatable;
16-
use Adldap\Laravel\Events\AuthenticationRejected;
17-
use Adldap\Laravel\Events\AuthenticationSuccessful;
18-
use Adldap\Laravel\Events\DiscoveredWithCredentials;
19-
use Adldap\Laravel\Events\AuthenticatedWithCredentials;
17+
use Illuminate\Support\Facades\Bus;
18+
use Illuminate\Support\Facades\Config;
19+
use Illuminate\Support\Facades\Event;
2020

2121
class DatabaseUserProvider extends EloquentUserProvider
2222
{

src/Auth/NoDatabaseUserProvider.php

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

33
namespace Adldap\Laravel\Auth;
44

5-
use Adldap\Laravel\Facades\Resolver;
6-
use Illuminate\Support\Facades\Event;
7-
use Adldap\Laravel\Traits\ValidatesUsers;
8-
use Illuminate\Contracts\Auth\UserProvider;
9-
use Illuminate\Contracts\Auth\Authenticatable;
5+
use Adldap\Laravel\Events\AuthenticatedWithCredentials;
106
use Adldap\Laravel\Events\AuthenticationRejected;
117
use Adldap\Laravel\Events\AuthenticationSuccessful;
128
use Adldap\Laravel\Events\DiscoveredWithCredentials;
13-
use Adldap\Laravel\Events\AuthenticatedWithCredentials;
9+
use Adldap\Laravel\Facades\Resolver;
10+
use Adldap\Laravel\Traits\ValidatesUsers;
11+
use Illuminate\Contracts\Auth\Authenticatable;
12+
use Illuminate\Contracts\Auth\UserProvider;
13+
use Illuminate\Support\Facades\Event;
1414

1515
class NoDatabaseUserProvider implements UserProvider
1616
{

src/Commands/Console/Import.php

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

33
namespace Adldap\Laravel\Commands\Console;
44

5-
use Exception;
5+
use Adldap\Laravel\Commands\Import as ImportUser;
6+
use Adldap\Laravel\Commands\SyncPassword;
7+
use Adldap\Laravel\Events\Imported;
8+
use Adldap\Laravel\Facades\Resolver;
69
use Adldap\Models\User;
7-
use Illuminate\Support\Arr;
8-
use UnexpectedValueException;
10+
use Exception;
911
use Illuminate\Console\Command;
10-
use Adldap\Laravel\Events\Imported;
12+
use Illuminate\Database\Eloquent\Model;
13+
use Illuminate\Support\Arr;
1114
use Illuminate\Support\Facades\Bus;
12-
use Adldap\Laravel\Facades\Resolver;
13-
use Illuminate\Support\Facades\Event;
1415
use Illuminate\Support\Facades\Config;
15-
use Illuminate\Database\Eloquent\Model;
16-
use Adldap\Laravel\Commands\SyncPassword;
17-
use Adldap\Laravel\Commands\Import as ImportUser;
16+
use Illuminate\Support\Facades\Event;
17+
use UnexpectedValueException;
1818

1919
class Import extends Command
2020
{

src/Commands/Import.php

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

33
namespace Adldap\Laravel\Commands;
44

5-
use Adldap\Models\User;
6-
use UnexpectedValueException;
75
use Adldap\Laravel\Events\Importing;
8-
use Adldap\Laravel\Facades\Resolver;
9-
use Illuminate\Support\Facades\Event;
10-
use Illuminate\Support\Facades\Config;
116
use Adldap\Laravel\Events\Synchronized;
12-
use Illuminate\Database\Eloquent\Model;
137
use Adldap\Laravel\Events\Synchronizing;
8+
use Adldap\Laravel\Facades\Resolver;
9+
use Adldap\Models\User;
10+
use Illuminate\Database\Eloquent\Model;
11+
use Illuminate\Support\Facades\Config;
12+
use Illuminate\Support\Facades\Event;
13+
use UnexpectedValueException;
1414

1515
class Import
1616
{

src/Commands/SyncPassword.php

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

33
namespace Adldap\Laravel\Commands;
44

5+
use Illuminate\Database\Eloquent\Model;
56
use Illuminate\Support\Arr;
6-
use Illuminate\Support\Str;
7-
use Illuminate\Support\Facades\Hash;
87
use Illuminate\Support\Facades\Config;
9-
use Illuminate\Database\Eloquent\Model;
8+
use Illuminate\Support\Facades\Hash;
9+
use Illuminate\Support\Str;
1010

1111
class SyncPassword
1212
{

src/Commands/UserImportScope.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace Adldap\Laravel\Commands;
44

55
use Adldap\Laravel\Facades\Resolver;
6+
use Illuminate\Database\Eloquent\Builder;
67
use Illuminate\Database\Eloquent\Model;
78
use Illuminate\Database\Eloquent\Scope;
8-
use Illuminate\Database\Eloquent\Builder;
99

1010
class UserImportScope implements Scope
1111
{

src/Facades/Resolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Adldap\Laravel\Facades;
44

5-
use Illuminate\Support\Facades\Facade;
65
use Adldap\Laravel\Resolvers\ResolverInterface;
6+
use Illuminate\Support\Facades\Facade;
77

88
/**
99
* @method static void setConnection(string $connection)

src/Listeners/BindsLdapUserModel.php

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

33
namespace Adldap\Laravel\Listeners;
44

5+
use Adldap\Laravel\Auth\DatabaseUserProvider;
56
use Adldap\Laravel\Facades\Resolver;
6-
use Illuminate\Support\Facades\Auth;
77
use Adldap\Laravel\Traits\HasLdapUser;
8-
use Adldap\Laravel\Auth\DatabaseUserProvider;
98
use Illuminate\Contracts\Auth\Authenticatable;
9+
use Illuminate\Support\Facades\Auth;
1010

1111
class BindsLdapUserModel
1212
{

0 commit comments

Comments
 (0)