Merge pull request #11 from BlakvGhost/fix-custom-rule-namespace-issu…

…e-in-validator-class Fix custom rule interface namespace issues in Validator
BlakvGhost · Nov 21, 2023 · 79a7978 · 79a7978
2 parents 697e4cc + 94157a6
commit 79a7978
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Validator.php b/src/Validator.php
@@ -13,7 +13,7 @@
 
 use BlakvGhost\PHPValidator\Lang\LangManager;
 use BlakvGhost\PHPValidator\Mapping\RulesMaped;
-use BlakvGhost\PHPValidator\Rules\RuleInterface;
+use BlakvGhost\PHPValidator\Contracts\Rule as RuleInterface;
 use BlakvGhost\PHPValidator\ValidatorException;
 
 class Validator extends RulesMaped

diff --git a/tests/Feature/ValidatorTest.php b/tests/Feature/ValidatorTest.php
@@ -1,6 +1,8 @@
 <?php
 
 use BlakvGhost\PHPValidator\Lang\LangManager;
+use BlakvGhost\PHPValidator\Mapping\RulesMaped;
+use BlakvGhost\PHPValidator\Rules\RequiredRule;
 use BlakvGhost\PHPValidator\Validator;
 use BlakvGhost\PHPValidator\ValidatorException;
 
@@ -19,6 +21,30 @@
         ->toThrow(ValidatorException::class, LangManager::getTranslation('validation.rule_not_found', ['ruleName' => 'nonexistent']));
 });
 
+it('validates custom rule (required) rule successfully', function () {
+
+    $validator = new Validator(['field' => 'value'], ['field' => new RequiredRule([])]);
+    expect($validator->isValid())->toBeTrue();
+
+    $validator = new Validator(['field' => 'value'], ['field' => [new RequiredRule([])]]);
+    expect($validator->isValid())->toBeTrue();
+
+    $validator = new Validator(['field' => 'value'], ['field' => ['string', new RequiredRule([])]]);
+    expect($validator->isValid())->toBeTrue();
+
+    RulesMaped::addRule('custom_required', RequiredRule::class);
+
+    $validator = new Validator(['field' => 'value'], ['field' => 'string|custom_required']);
+    expect($validator->isValid())->toBeTrue();
+
+    $validator = new Validator(['field' => ''], ['field' => new RequiredRule([])]);
+    expect($validator->isValid())->toBeFalse();
+
+    expect($validator->getErrors()['field'][0])->toBe(
+        LangManager::getTranslation('validation.required_rule', ['attribute' => 'field'])
+    );
+});
+
 it('validates rule with custom error message', function () {
 
     $errorMessage = "Je teste une règle custom";