change params

taylorotwell · taylorotwell · commit e3fcd97d16a0 · 2021-04-23T08:24:18.000-05:00
diff --git 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
@@ -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;
         }));
 

Original file line number	Diff line number	Diff line change
`@@ -379,11 +379,11 @@ public function attempt(array $credentials = [], $remember = false)`
`379`	`379`	`* Attempt to authenticate a user with credentials and additional callbacks.`
`380`	`380`	`*`
`381`	`381`	`* @param array $credentials`
`382`		`- * @param false $remember`
`383`	`382`	`* @param array\|callable $callbacks`
	`383`	`+ * @param false $remember`
`384`	`384`	`* @return bool`
`385`	`385`	`*/`
`386`		`- public function attemptWith(array $credentials = [], $remember = false, $callbacks = null)`
	`386`	`+ public function attemptWhen(array $credentials = [], $callbacks = null, $remember = false)`
`387`	`387`	`{`
`388`	`388`	`$this->fireAttemptEvent($credentials, $remember);`
`389`	`389`