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

[Breaking Change] Refactor validation rules: alpha, alpha_dash, alpha_num #45767

Closed
wants to merge 3 commits into from
Closed

[Breaking Change] Refactor validation rules: alpha, alpha_dash, alpha_num #45767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4441ec3
fix regexp and docs
fuwasegu Jan 23, 2023
59c39e6
add new validation rule for multibyte letters
fuwasegu Jan 23, 2023
fa7c923
fix test
fuwasegu Jan 23, 2023
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
54 changes: 49 additions & 5 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,19 +334,19 @@ protected function getDateTime($value)
}

/**
* Validate that an attribute contains only alphabetic characters.
* Validate that an attribute contains only ascii alphabetic characters.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function validateAlpha($attribute, $value)
{
return is_string($value) && preg_match('/^[\pL\pM]+$/u', $value);
return is_string($value) && preg_match('/^[a-zA-Z]+$/u', $value) > 0;
}

/**
* Validate that an attribute contains only alpha-numeric characters, dashes, and underscores.
* Validate that an attribute contains only ascii alpha-numeric characters, dashes, and underscores.
*
* @param string $attribute
* @param mixed $value
Expand All @@ -358,11 +358,11 @@ public function validateAlphaDash($attribute, $value)
return false;
}

return preg_match('/^[\pL\pM\pN_-]+$/u', $value) > 0;
return preg_match('/^[a-zA-Z0-9_-]+$/u', $value) > 0;
}

/**
* Validate that an attribute contains only alpha-numeric characters.
* Validate that an attribute contains only ascii alpha-numeric characters.
*
* @param string $attribute
* @param mixed $value
Expand All @@ -374,6 +374,50 @@ public function validateAlphaNum($attribute, $value)
return false;
}

return preg_match('/^[a-zA-Z0-9]+$/u', $value) > 0;
}

/**
* Validate that an attribute contains only multibyte alphabetic characters.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function validateAlphaMb($attribute, $value)
{
return is_string($value) && preg_match('/^[\pL\pM]+$/u', $value) > 0;
}

/**
* Validate that an attribute contains only multibyte alpha-numeric characters, dashes, and underscores.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function validateAlphaDashMb($attribute, $value)
{
if (! is_string($value) && ! is_numeric($value)) {
return false;
}

return preg_match('/^[\pL\pM\pN_-]+$/u', $value) > 0;
}

/**
* Validate that an attribute contains only multibyte alpha-numeric characters.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function validateAlphaNumMb($attribute, $value)
{
if (! is_string($value) && ! is_numeric($value)) {
return false;
}

return preg_match('/^[\pL\pM\pN]+$/u', $value) > 0;
}

Expand Down
146 changes: 122 additions & 24 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4145,83 +4145,181 @@ public function testAlternativeFormat()
public function testValidateAlpha()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'aslsdlks'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'aslsdlks'], ['x' => 'alpha']);
$this->assertTrue($v->passes());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, [
'x' => 'aslsdlks
1
1',
], ['x' => 'Alpha']);
], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'http://google.com'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'http://google.com'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコード を基盤技術と'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'आपका स्वागत है'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'Continuación'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ofreció su dimisión'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '❤'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '123'], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 123], ['x' => 'alpha']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'abc123'], ['x' => 'alpha']);
$this->assertFalse($v->passes());
}

public function testValidateAlphaNum()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'asls13dlks'], ['x' => 'alpha_num']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'http://g232oogle.com'], ['x' => 'alpha_num']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と'], ['x' => 'alpha_num']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と123'], ['x' => 'alpha_num']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '१२३'], ['x' => 'alpha_num']); // numbers in Hindi
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'alpha_num']); // eastern arabic numerals
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'alpha_num']);
$this->assertFalse($v->passes());
}

public function testValidateAlphaDash()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'asls1-_3dlks'], ['x' => 'alpha_dash']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'http://-g232oogle.com'], ['x' => 'alpha_dash']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と-_123'], ['x' => 'alpha_dash']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार-_'], ['x' => 'alpha_dash']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'alpha_dash']); // eastern arabic numerals
$this->assertFalse($v->passes());
}

public function testValidateAlphaMb()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'aslsdlks'], ['x' => 'alpha_mb']);
$this->assertTrue($v->passes());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, [
'x' => 'aslsdlks
1
1',
], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'http://google.com'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と'], ['x' => 'alpha_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'ユニコード を基盤技術と'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'ユニコード を基盤技術と'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'alpha_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'आपका स्वागत है'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'आपका स्वागत है'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'Continuación'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'Continuación'], ['x' => 'alpha_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'ofreció su dimisión'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'ofreció su dimisión'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '❤'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => '❤'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '123'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => '123'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 123], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 123], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'abc123'], ['x' => 'Alpha']);
$v = new Validator($trans, ['x' => 'abc123'], ['x' => 'alpha_mb']);
$this->assertFalse($v->passes());
}

public function testValidateAlphaNum()
public function testValidateAlphaNumMb()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'asls13dlks'], ['x' => 'AlphaNum']);
$v = new Validator($trans, ['x' => 'asls13dlks'], ['x' => 'alpha_num_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'http://g232oogle.com'], ['x' => 'AlphaNum']);
$v = new Validator($trans, ['x' => 'http://g232oogle.com'], ['x' => 'alpha_num_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => '१२३'], ['x' => 'AlphaNum']); // numbers in Hindi
$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と123'], ['x' => 'alpha_num_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'AlphaNum']); // eastern arabic numerals
$v = new Validator($trans, ['x' => '१२३'], ['x' => 'alpha_num_mb']); // numbers in Hindi
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'AlphaNum']);
$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'alpha_num_mb']); // eastern arabic numerals
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार'], ['x' => 'alpha_num_mb']);
$this->assertTrue($v->passes());
}

public function testValidateAlphaDash()
public function testValidateAlphaDashMb()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['x' => 'asls1-_3dlks'], ['x' => 'AlphaDash']);
$v = new Validator($trans, ['x' => 'asls1-_3dlks'], ['x' => 'alpha_dash_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'http://-g232oogle.com'], ['x' => 'AlphaDash']);
$v = new Validator($trans, ['x' => 'http://-g232oogle.com'], ['x' => 'alpha_dash_mb']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार-_'], ['x' => 'AlphaDash']);
$v = new Validator($trans, ['x' => 'ユニコードを基盤技術と-_123'], ['x' => 'alpha_dash_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => 'नमस्कार-_'], ['x' => 'alpha_dash_mb']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'AlphaDash']); // eastern arabic numerals
$v = new Validator($trans, ['x' => '٧٨٩'], ['x' => 'alpha_dash_mb']); // eastern arabic numerals
$this->assertTrue($v->passes());
}

Expand Down