deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-01 13:22:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the validation engine of the "Charset" rule

Browse source 
Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
This commit is contained in:
Henrique Moody 2024-02-23 02:15:00 +01:00
parent 85bff04ad8
commit 9cc57f8ffc
No known key found for this signature in database
GPG key ID: 221E9281655813A6
4 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/ChainedValidator.php
View file

@ -53,7 +53,7 @@ interface ChainedValidator extends Validatable
public function callback(callable $callback): ChainedValidator;
public function charset(string ...$charset): ChainedValidator;
public function charset(string $charset, string ...$charsets): ChainedValidator;
public function cnh(): ChainedValidator;

40
library/Rules/Charset.php
View file

@ -9,45 +9,47 @@ declare(strict_types=1);
namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Exceptions\InvalidRuleConstructorException;
use Respect\Validation\Message\Template;
use Respect\Validation\Result;
use function array_diff;
use function array_merge;
use function array_values;
use function count;
use function in_array;
use function mb_detect_encoding;
use function mb_list_encodings;
use function Respect\Stringifier\stringify;
#[Template(
'{{name}} must be in the {{charset|raw}} charset',
'{{name}} must not be in the {{charset|raw}} charset',
)]
final class Charset extends AbstractRule
final class Charset extends Standard
{
/**
* @var string[]
*/
/** @var non-empty-array<string> */
private readonly array $charset;
public function __construct(string ...$charset)
public function __construct(string $charset, string ...$charsets)
{
$available = mb_list_encodings();
if (!empty(array_diff($charset, $available))) {
throw new ComponentException('Invalid charset');
$charsets = array_merge([$charset], $charsets);
$diff = array_diff($charsets, $available);
if (count($diff) > 0) {
throw new InvalidRuleConstructorException('Invalid charset provided: %s', stringify(array_values($diff)));
}
$this->charset = $charset;
$this->charset = $charsets;
}
public function validate(mixed $input): bool
public function evaluate(mixed $input): Result
{
return in_array(mb_detect_encoding($input, $this->charset, true), $this->charset, true);
}
/**
* @return array<string, array<string>>
*/
public function getParams(): array
{
return ['charset' => $this->charset];
return new Result(
in_array(mb_detect_encoding($input, $this->charset, true), $this->charset),
$input,
$this,
['charset' => $this->charset],
);
}
}

2
library/StaticValidator.php
View file

@ -55,7 +55,7 @@ interface StaticValidator
public static function callback(callable $callback): ChainedValidator;
public static function charset(string ...$charset): ChainedValidator;
public static function charset(string $charset, string ...$charsets): ChainedValidator;
public static function cnh(): ChainedValidator;

6
tests/unit/Rules/CharsetTest.php
View file

@ -12,7 +12,7 @@ namespace Respect\Validation\Rules;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Test;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Exceptions\InvalidRuleConstructorException;
use Respect\Validation\Test\RuleTestCase;
use function mb_convert_encoding;
@ -24,8 +24,8 @@ final class CharsetTest extends RuleTestCase
#[Test]
public function itShouldThrowsExceptionWhenCharsetIsNotValid(): void
{
$this->expectException(ComponentException::class);
$this->expectExceptionMessage('Invalid charset');
$this->expectException(InvalidRuleConstructorException::class);
$this->expectExceptionMessage('Invalid charset provided: `["UTF-9"]`');
new Charset('UTF-8', 'UTF-9');
}