Skip to content

Commit 39b1fd3

Browse files
Fixed validation rule alpha_dash does not support int. (#2927)
* Updated validation.md * Fixed validation rule `alpha_dash` does not support `int`. * Update CHANGELOG-2.0.md Co-authored-by: 李铭昕 <715557344@qq.com>
1 parent 9146a15 commit 39b1fd3

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

src/Concerns/ValidatesAttributes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function validateAlphaDash(string $attribute, $value): bool
146146
return false;
147147
}
148148

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

152152
/**

tests/Cases/ValidateAttributesTest.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,45 @@
2020
*/
2121
class ValidateAttributesTest extends TestCase
2222
{
23+
public function testValidateAlpha()
24+
{
25+
$validator = new ValidatesAttributesStub();
26+
$this->assertTrue($validator->validateAlpha('', 'xxx'));
27+
$this->assertTrue($validator->validateAlpha('', '你好'));
28+
29+
$this->assertFalse($validator->validateAlpha('', '123'));
30+
$this->assertFalse($validator->validateAlpha('', '123f1'));
31+
$this->assertFalse($validator->validateAlpha('', 123));
32+
$this->assertFalse($validator->validateAlpha('', 123.1));
33+
$this->assertFalse($validator->validateAlpha('', '123_f1'));
34+
$this->assertFalse($validator->validateAlpha('', 'xxx_yy'));
35+
}
36+
37+
public function testValidateAlphaDash()
38+
{
39+
$validator = new ValidatesAttributesStub();
40+
$this->assertTrue($validator->validateAlphaDash('', 'xxx'));
41+
$this->assertTrue($validator->validateAlphaDash('', 'xxx_yy'));
42+
$this->assertTrue($validator->validateAlphaDash('', '你好'));
43+
$this->assertTrue($validator->validateAlphaDash('', '123'));
44+
$this->assertTrue($validator->validateAlphaDash('', '123f1'));
45+
$this->assertTrue($validator->validateAlphaDash('', 123));
46+
$this->assertTrue($validator->validateAlphaDash('', '123_f1'));
47+
48+
$this->assertFalse($validator->validateAlphaDash('', 123.1));
49+
}
50+
2351
public function testValidateAlphaNum()
2452
{
2553
$validator = new ValidatesAttributesStub();
2654
$this->assertTrue($validator->validateAlphaNum('', 'xxx'));
2755
$this->assertTrue($validator->validateAlphaNum('', '123'));
2856
$this->assertTrue($validator->validateAlphaNum('', '123f1'));
2957
$this->assertTrue($validator->validateAlphaNum('', 123));
58+
$this->assertTrue($validator->validateAlphaNum('', '你好'));
3059

3160
$this->assertFalse($validator->validateAlphaNum('', 123.1));
3261
$this->assertFalse($validator->validateAlphaNum('', '123_f1'));
62+
$this->assertFalse($validator->validateAlphaNum('', 'xxx_yy'));
3363
}
3464
}

0 commit comments

Comments
 (0)