Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.2] Add messages and custom attributes to the password reset validation #12997

Merged
merged 1 commit into from
Apr 5, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/Illuminate/Foundation/Auth/ResetsPasswords.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,12 @@ public function postReset(Request $request)
*/
public function reset(Request $request)
{
$this->validate($request, $this->getResetValidationRules());
$this->validate(
$request,
$this->getResetValidationRules(),
$this->getResetValidationMessages(),
$this->getResetValidationCustomAttributes()
);

$credentials = $request->only(
'email', 'password', 'password_confirmation', 'token'
Expand Down Expand Up @@ -216,6 +221,26 @@ protected function getResetValidationRules()
];
}

/**
* Get the password reset validation messages.
*
* @return array
*/
protected function getResetValidationMessages()
{
return [];
}

/**
* Get the password reset validation custom attributes.
*
* @return array
*/
protected function getResetValidationCustomAttributes()
{
return [];
}

/**
* Reset the given user's password.
*
Expand Down