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

[8.x] Add an Enum validation rule #39437

Merged
merged 4 commits into from
Nov 1, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
62 changes: 62 additions & 0 deletions src/Illuminate/Validation/Rules/Enum.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php

namespace Illuminate\Validation\Rules;

use Illuminate\Container\Container;
use Illuminate\Contracts\Validation\DataAwareRule;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Contracts\Validation\UncompromisedVerifier;
use Illuminate\Contracts\Validation\ValidatorAwareRule;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Traits\Conditionable;
use InvalidArgumentException;

class Enum implements Rule
{
/**
* The type of the enum.
*
* @var string
*/
protected $type;

/**
* Create a new rule instance.
*
* @param string $type
* @return void
*/
public function __construct($type)
{
$this->type = $type;
}

/**
* Determine if the validation rule passes.
*
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function passes($attribute, $value)
{
if (is_null($value) || ! function_exists('enum_exists') || ! enum_exists($this->type)) {
return false;
}

return ! is_null($this->type::tryFrom($value));
}

/**
* Get the validation error message.
*
* @return array
*/
public function message()
{
return [
'The selected :attribute is invalid.'
];
}
}
15 changes: 15 additions & 0 deletions tests/Validation/Enums.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace Illuminate\Tests\Validation;

enum StringStatus: string
{
case pending = 'pending';
case done = 'done';
}

enum IntegerStatus: int
{
case pending = 1;
case done = 2;
}
144 changes: 144 additions & 0 deletions tests/Validation/ValidationEnumRuleTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<?php

namespace Illuminate\Tests\Validation;

use Illuminate\Container\Container;
use Illuminate\Support\Facades\Facade;
use Illuminate\Translation\ArrayLoader;
use Illuminate\Translation\Translator;
use Illuminate\Validation\Rules\Enum;
use Illuminate\Validation\Rules\Password;
use Illuminate\Validation\ValidationServiceProvider;
use Illuminate\Validation\Validator;
use PHPUnit\Framework\TestCase;

if (PHP_VERSION_ID >= 80100) {
include 'Enums.php';
}

/**
* @requires PHP 8.1
themsaid marked this conversation as resolved.
Show resolved Hide resolved
*/
class ValidationEnumRuleTest extends TestCase
{
public function testvalidationPassesWhenPassingCorrectEnum()
{
$v = new Validator(
resolve('translator'),
[
'status' => 'pending',
'int_status' => 1
],
[
'status' => new Enum(StringStatus::class),
'int_status' => new Enum(IntegerStatus::class),
]
);

$this->assertFalse($v->fails());
}

public function testValidationFailsWhenProvidingNoExistingCases()
{
$v = new Validator(
resolve('translator'),
[
'status' => 'finished',
],
[
'status' => new Enum(StringStatus::class),
]
);

$this->assertTrue($v->fails());
$this->assertEquals(['The selected status is invalid.'], $v->messages()->get('status'));
}

public function testValidationFailsWhenProvidingDifferentType()
{
$v = new Validator(
resolve('translator'),
[
'status' => 10,
],
[
'status' => new Enum(StringStatus::class),
]
);

$this->assertTrue($v->fails());
$this->assertEquals(['The selected status is invalid.'], $v->messages()->get('status'));
}

public function testValidationPassesWhenProvidingDifferentTypeThatIsCastableToTheEnumType()
{
$v = new Validator(
resolve('translator'),
[
'status' => '1',
],
[
'status' => new Enum(IntegerStatus::class),
]
);

$this->assertFalse($v->fails());
}

public function testValidationFailsWhenProvidingNull()
{
$v = new Validator(
resolve('translator'),
[
'status' => null,
],
[
'status' => new Enum(StringStatus::class),
]
);

$this->assertTrue($v->fails());
$this->assertEquals(['The selected status is invalid.'], $v->messages()->get('status'));
}

public function testValidationPassesWhenProvidingNullButTheFieldIsNullable()
{
$v = new Validator(
resolve('translator'),
[
'status' => null,
],
[
'status' => ['nullable', new Enum(StringStatus::class)],
]
);

$this->assertFalse($v->fails());
}

protected function setUp(): void
{
$container = Container::getInstance();

$container->bind('translator', function () {
return new Translator(
new ArrayLoader, 'en'
);
});

Facade::setFacadeApplication($container);

(new ValidationServiceProvider($container))->register();
}

protected function tearDown(): void
{
Container::setInstance(null);

Facade::clearResolvedInstances();

Facade::setFacadeApplication(null);

Password::$defaultCallback = null;
}
}