-
Notifications
You must be signed in to change notification settings - Fork 11.4k
[12.x] Add Rule::contains
#55809
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
Merged
Merged
[12.x] Add Rule::contains
#55809
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
|
||
namespace Illuminate\Validation\Rules; | ||
|
||
use Illuminate\Contracts\Support\Arrayable; | ||
use Stringable; | ||
|
||
use function Illuminate\Support\enum_value; | ||
|
||
class Contains implements Stringable | ||
{ | ||
/** | ||
* The values that should be contained in the attribute. | ||
* | ||
* @var array | ||
*/ | ||
protected $values; | ||
|
||
/** | ||
* Create a new contains rule instance. | ||
* | ||
* @param \Illuminate\Contracts\Support\Arrayable|\BackedEnum|\UnitEnum|array|string $values | ||
* @return void | ||
*/ | ||
public function __construct($values) | ||
{ | ||
if ($values instanceof Arrayable) { | ||
$values = $values->toArray(); | ||
} | ||
|
||
$this->values = is_array($values) ? $values : func_get_args(); | ||
} | ||
|
||
/** | ||
* Convert the rule to a validation string. | ||
* | ||
* @return string | ||
*/ | ||
public function __toString() | ||
{ | ||
$values = array_map(function ($value) { | ||
$value = enum_value($value); | ||
|
||
return '"'.str_replace('"', '""', $value).'"'; | ||
}, $this->values); | ||
|
||
return 'contains:'.implode(',', $values); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Validation; | ||
|
||
use Illuminate\Translation\ArrayLoader; | ||
use Illuminate\Translation\Translator; | ||
use Illuminate\Validation\Rule; | ||
use Illuminate\Validation\Validator; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
include_once 'Enums.php'; | ||
|
||
class ValidationRuleContainsTest extends TestCase | ||
{ | ||
public function testItCorrectlyFormatsAStringVersionOfTheRule() | ||
{ | ||
$rule = Rule::contains('Taylor'); | ||
$this->assertSame('contains:"Taylor"', (string) $rule); | ||
|
||
$rule = Rule::contains('Taylor', 'Abigail'); | ||
$this->assertSame('contains:"Taylor","Abigail"', (string) $rule); | ||
|
||
$rule = Rule::contains(['Taylor', 'Abigail']); | ||
$this->assertSame('contains:"Taylor","Abigail"', (string) $rule); | ||
|
||
$rule = Rule::contains(collect(['Taylor', 'Abigail'])); | ||
$this->assertSame('contains:"Taylor","Abigail"', (string) $rule); | ||
|
||
$rule = Rule::contains([ArrayKeys::key_1, ArrayKeys::key_2]); | ||
$this->assertSame('contains:"key_1","key_2"', (string) $rule); | ||
|
||
$rule = Rule::contains([ArrayKeysBacked::key_1, ArrayKeysBacked::key_2]); | ||
$this->assertSame('contains:"key_1","key_2"', (string) $rule); | ||
|
||
$rule = Rule::contains(['Taylor', 'Taylor']); | ||
$this->assertSame('contains:"Taylor","Taylor"', (string) $rule); | ||
|
||
$rule = Rule::contains([1, 2, 3]); | ||
$this->assertSame('contains:"1","2","3"', (string) $rule); | ||
|
||
$rule = Rule::contains(['"foo"', '"bar"', '"baz"']); | ||
$this->assertSame('contains:"""foo""","""bar""","""baz"""', (string) $rule); | ||
} | ||
|
||
public function testContainsValidation() | ||
{ | ||
$trans = new Translator(new ArrayLoader, 'en'); | ||
|
||
// Test fails when value is string | ||
$v = new Validator($trans, ['roles' => 'admin'], ['roles' => Rule::contains('editor')]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test passes when array contains the value | ||
$v = new Validator($trans, ['roles' => ['admin', 'user']], ['roles' => Rule::contains('admin')]); | ||
$this->assertTrue($v->passes()); | ||
|
||
// Test fails when array doesn't contain all the values | ||
$v = new Validator($trans, ['roles' => ['admin', 'user']], ['roles' => Rule::contains(['admin', 'editor'])]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test fails when array doesn't contain all the values (using multiple arguments) | ||
$v = new Validator($trans, ['roles' => ['admin', 'user']], ['roles' => Rule::contains('admin', 'editor')]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test passes when array contains all the values | ||
$v = new Validator($trans, ['roles' => ['admin', 'user', 'editor']], ['roles' => Rule::contains(['admin', 'editor'])]); | ||
$this->assertTrue($v->passes()); | ||
|
||
// Test passes when array contains all the values (using multiple arguments) | ||
$v = new Validator($trans, ['roles' => ['admin', 'user', 'editor']], ['roles' => Rule::contains('admin', 'editor')]); | ||
$this->assertTrue($v->passes()); | ||
|
||
// Test fails when array doesn't contain the value | ||
$v = new Validator($trans, ['roles' => ['admin', 'user']], ['roles' => Rule::contains('editor')]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test fails when array doesn't contain any of the values | ||
$v = new Validator($trans, ['roles' => ['admin', 'user']], ['roles' => Rule::contains(['editor', 'manager'])]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test with empty array | ||
$v = new Validator($trans, ['roles' => []], ['roles' => Rule::contains('admin')]); | ||
$this->assertTrue($v->fails()); | ||
|
||
// Test with nullable field | ||
$v = new Validator($trans, ['roles' => null], ['roles' => ['nullable', Rule::contains('admin')]]); | ||
$this->assertTrue($v->passes()); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stevebauman doesnt that reference a method registered in orchestra? Not sure if that dependency is wanted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@patriziotomato
framework/src/Illuminate/Collections/functions.php
Line 18 in 3d084e4