Change the name of the new config value, and associated method, to 'e…

…mail' to match other apps and packages in the eco system.

config/fortify.php

@@ -6,7 +6,7 @@
     'guard' => 'web',
     'passwords' => 'users',
     'username' => 'email',
-    'email_address' => 'email',
+    'email' => 'email',
     'home' => '/home',
     'limiters' => [
         'login' => null,

src/Fortify.php

@@ -48,9 +48,9 @@ class Fortify
     /**
      * Get the name of the email address request variable.
      */
-    public static function emailAddress()
+    public static function email()
     {
-        return config('fortify.email_address', 'email');
+        return config('fortify.email', 'email');
     }
 
     /**

src/Http/Controllers/NewPasswordController.php

@@ -56,14 +56,14 @@ public function store(Request $request): Responsable
     {
         $request->validate([
             'token' => 'required',
-            Fortify::emailAddress() => 'required|email',
+            Fortify::email() => 'required|email',
         ]);
 
         // Here we will attempt to reset the user's password. If it is successful we
         // will update the password on an actual user model and persist it to the
         // database. Otherwise we will parse the error and return the response.
         $status = $this->broker()->reset(
-            $request->only(Fortify::emailAddress(), 'password', 'password_confirmation', 'token'),
+            $request->only(Fortify::email(), 'password', 'password_confirmation', 'token'),
             function ($user, $password) use ($request) {
                 app(ResetsUserPasswords::class)->reset($user, $request->all());
 

src/Http/Controllers/PasswordResetLinkController.php

@@ -33,13 +33,13 @@ public function create(Request $request): RequestPasswordResetLinkViewResponse
      */
     public function store(Request $request): Responsable
     {
-        $request->validate([Fortify::emailAddress() => 'required|email']);
+        $request->validate([Fortify::email() => 'required|email']);
 
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
         $status = $this->broker()->sendResetLink(
-            $request->only(Fortify::emailAddress())
+            $request->only(Fortify::email())
         );
 
         return $status == Password::RESET_LINK_SENT

stubs/fortify.php

@@ -54,7 +54,7 @@
     | needs another name, you are free to set the name of it here.
     |
     */
-    'email_address' => 'email',
+    'email' => 'email',
 
     /*
     |--------------------------------------------------------------------------

tests/NewPasswordControllerTest.php

@@ -100,7 +100,7 @@ public function test_password_reset_can_fail_with_json()
 
     public function test_password_can_be_reset_with_customized_email_address_field()
     {
-        Config::set('fortify.email_address', 'emailAddress');
+        Config::set('fortify.email', 'emailAddress');
         Password::shouldReceive('broker')->andReturn($broker = Mockery::mock(PasswordBroker::class));
 
         $guard = $this->mock(StatefulGuard::class);

tests/PasswordResetLinkRequestControllerTest.php

@@ -66,7 +66,7 @@ public function test_reset_link_request_can_fail_with_json()
 
     public function test_reset_link_can_be_successfully_requested_with_customized_email_field()
     {
-        Config::set('fortify.email_address', 'emailAddress');
+        Config::set('fortify.email', 'emailAddress');
         Password::shouldReceive('broker')->andReturn($broker = Mockery::mock(PasswordBroker::class));
 
         $broker->shouldReceive('sendResetLink')->andReturn(Password::RESET_LINK_SENT);