Skip to content

Commit 352673e

Browse files
committed
Don't use rescue helper due to backwards compatibility issues
1 parent b265cb7 commit 352673e

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/Auth/UserProvider.php

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

33
namespace LdapRecord\Laravel\Auth;
44

5-
use Illuminate\Contracts\Auth\UserProvider as LaravelUserProvider;
6-
use Illuminate\Validation\ValidationException;
7-
use LdapRecord\Laravel\LdapUserAuthenticator;
5+
use Exception;
86
use LdapRecord\Laravel\LdapUserRepository;
7+
use LdapRecord\Laravel\LdapUserAuthenticator;
8+
use Illuminate\Validation\ValidationException;
9+
use Illuminate\Contracts\Auth\UserProvider as LaravelUserProvider;
910

1011
abstract class UserProvider implements LaravelUserProvider
1112
{
@@ -55,13 +56,13 @@ public function __construct(LdapUserRepository $users, LdapUserAuthenticator $au
5556
*
5657
* @throws ValidationException
5758
*/
58-
protected function fetchLdapUserByCredentials($credentials)
59+
protected function fetchLdapUserByCredentials(array $credentials)
5960
{
60-
return rescue(function () use ($credentials) {
61+
try {
6162
return call_user_func($this->userResolver, $credentials);
62-
}, function ($e) {
63+
} catch (Exception $e) {
6364
$this->handleException($e);
64-
});
65+
}
6566
}
6667

6768
/**

0 commit comments

Comments
 (0)