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.

Sign up for GitHub

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.8] Email validation will reject non-string values #27735

Merged
merged 5 commits into from
Mar 4, 2019
Merged

[5.8] Email validation will reject non-string values #27735

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a5d87c
Email validation will reject non-string values
paul-thebaud Mar 1, 2019
7b4704f
Fix CS in ValidationValidatorTest
paul-thebaud Mar 1, 2019
2cfe071
Email validation accept string or object with __toString method
paul-thebaud Mar 1, 2019
372ba05
Fix CS
paul-thebaud Mar 1, 2019
8c5d0b6
Update ValidatesAttributes.php
taylorotwell Mar 4, 2019
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
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ protected function extractDistinctValues($attribute)
*/
public function validateEmail($attribute, $value)
{
return (new EmailValidator)->isValid($value, new RFCValidation);
return is_string($value) && (new EmailValidator)->isValid($value, new RFCValidation);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RFCValidation::isValid() also accepts an object implementing __toString():

https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/RFCValidation.php#L30

Copy link
Contributor Author

@paul-thebaud paul-thebaud Mar 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this. Now, the validation method will first check to have a string or an object implementing __toString, before validating it using RFC.

}

/**
Expand Down
3 changes: 3 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,6 +2016,9 @@ public function testValidateEmail()
$v = new Validator($trans, ['x' => 'aslsdlks'], ['x' => 'Email']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => ['not a string']], ['x' => 'Email']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '[email protected]'], ['x' => 'Email']);
$this->assertTrue($v->passes());
}
Expand Down