From bf25e3d7dac82acb5fc9bb3aa8b0380e014950d4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 23 Apr 2021 08:24:18 -0500 Subject: [PATCH] change params --- src/Illuminate/Auth/SessionGuard.php | 4 ++-- tests/Auth/AuthGuardTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Illuminate/Auth/SessionGuard.php b/src/Illuminate/Auth/SessionGuard.php index 62d804102f85..344f892e4052 100644 --- a/src/Illuminate/Auth/SessionGuard.php +++ b/src/Illuminate/Auth/SessionGuard.php @@ -379,11 +379,11 @@ public function attempt(array $credentials = [], $remember = false) * Attempt to authenticate a user with credentials and additional callbacks. * * @param array $credentials - * @param false $remember * @param array|callable $callbacks + * @param false $remember * @return bool */ - public function attemptWith(array $credentials = [], $remember = false, $callbacks = null) + public function attemptWhen(array $credentials = [], $callbacks = null, $remember = false) { $this->fireAttemptEvent($credentials, $remember); diff --git a/tests/Auth/AuthGuardTest.php b/tests/Auth/AuthGuardTest.php index dea34e366a88..f7b89b081dbf 100755 --- a/tests/Auth/AuthGuardTest.php +++ b/tests/Auth/AuthGuardTest.php @@ -145,14 +145,14 @@ public function testAttemptAndWithCallbacks() $mock->getProvider()->shouldReceive('validateCredentials')->twice()->andReturnTrue(); $mock->getProvider()->shouldReceive('validateCredentials')->once()->andReturnFalse(); - $this->assertTrue($mock->attemptWith(['foo'], false, function ($user, $guard) { + $this->assertTrue($mock->attemptWhen(['foo'], function ($user, $guard) { static::assertInstanceOf(Authenticatable::class, $user); static::assertInstanceOf(SessionGuard::class, $guard); return true; })); - $this->assertFalse($mock->attemptWith(['foo'], false, function ($user, $guard) { + $this->assertFalse($mock->attemptWhen(['foo'], function ($user, $guard) { static::assertInstanceOf(Authenticatable::class, $user); static::assertInstanceOf(SessionGuard::class, $guard); @@ -161,7 +161,7 @@ public function testAttemptAndWithCallbacks() $executed = false; - $this->assertFalse($mock->attemptWith(['foo'], false, function () use (&$executed) { + $this->assertFalse($mock->attemptWhen(['foo'], false, function () use (&$executed) { return $executed = true; }));