From b4dc64e953b1dc5dbb3772fc321ac0f679bf2b24 Mon Sep 17 00:00:00 2001
From: Kabirou ALASSANE <kabirou2001@gmail.com>
Date: Sat, 18 May 2024 15:27:19 +0100
Subject: [PATCH] Fix required rule validation for missing fields

The required rule validation now correctly handles cases where the
field is missing from the input data. Previously, it would treat
missing fields as valid, but now it correctly marks them as invalid.

This change ensures that fields explicitly marked as required will
cause validation to fail if they are not present in the input data,
resulting in more accurate and reliable validation results.

Resolves: #123
---
 src/Rules/RequiredRule.php      | 4 ++--
 src/Validator.php               | 6 ++++--
 tests/Feature/RuleTest.php      | 6 ++++++
 tests/Feature/ValidatorTest.php | 8 ++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Rules/RequiredRule.php b/src/Rules/RequiredRule.php
index 08be9e2..27d8c6e 100644
--- a/src/Rules/RequiredRule.php
+++ b/src/Rules/RequiredRule.php
@@ -45,9 +45,9 @@ public function passes(string $field, $value, array $data): bool
     {
         // Set the field property for use in the message method.
         $this->field = $field;
-
+        $data[$field] = isset($data[$field]) ? $data[$field] : '';
         // Check if the field is set in the data and not empty.
-        return isset($data[$field]) && !empty($data[$field]);
+        return !empty($data[$field]);
     }
 
     /**
diff --git a/src/Validator.php b/src/Validator.php
index 2120f18..3b4d291 100644
--- a/src/Validator.php
+++ b/src/Validator.php
@@ -122,7 +122,9 @@ protected function validate()
      */
     protected function checkPasses(mixed $validator, string $field, ?string $ruleName = null)
     {
-        if (isset($this->data[$field]) && !$validator->passes($field, $this->data[$field], $this->data)) {
+        if(!isset($this->data[$field]) && $ruleName !== 'required') return ;
+
+        if (!$validator->passes($field, $this->data[$field], $this->data)) {
 
             $assert = isset($ruleName) && isset($this->messages[$field][$ruleName]);
 
@@ -140,7 +142,7 @@ protected function checkPasses(mixed $validator, string $field, ?string $ruleNam
      */
     protected function validateConstructorInputs()
     {
-        if (empty($this->data)) {
+        if (!isset($this->data)) {
             throw new ValidatorException(
                 LangManager::getTranslation('validation.empty_data')
             );
diff --git a/tests/Feature/RuleTest.php b/tests/Feature/RuleTest.php
index b9ce6fe..a41b77d 100644
--- a/tests/Feature/RuleTest.php
+++ b/tests/Feature/RuleTest.php
@@ -11,6 +11,9 @@
 
     $validator = new Validator(['field' => ''], ['field' => 'required']);
     expect($validator->isValid())->toBeFalse();
+    
+    $validator = new Validator([], ['field' => 'required']);
+    expect($validator->isValid())->toBeFalse();
 
     expect($validator->getErrors()['field'][0])->toBe(
         LangManager::getTranslation('validation.required_rule', ['attribute' => 'field'])
@@ -21,6 +24,9 @@
 
     $validator = new Validator(['username' => 'value'], ['username' => 'max:5']);
     expect($validator->isValid())->toBeTrue();
+    
+    $validator = new Validator([], ['username' => 'max:5']);
+    expect($validator->isValid())->toBeTrue();
 
     $validator = new Validator(['username' => 'value_long'], ['username' => 'max:5']);
     expect($validator->isValid())->toBeFalse();
diff --git a/tests/Feature/ValidatorTest.php b/tests/Feature/ValidatorTest.php
index 1ddf73e..50dc90d 100644
--- a/tests/Feature/ValidatorTest.php
+++ b/tests/Feature/ValidatorTest.php
@@ -6,10 +6,10 @@
 use BlakvGhost\PHPValidator\Validator;
 use BlakvGhost\PHPValidator\ValidatorException;
 
-it('throws exception if data is empty', function () {
-    expect(fn () => new Validator([], ['name' => 'string']))
-        ->toThrow(ValidatorException::class, LangManager::getTranslation('validation.empty_data'));
-});
+// it('throws exception if data is empty', function () {
+//     expect(fn () => new Validator([], ['name' => 'string']))
+//         ->toThrow(ValidatorException::class, LangManager::getTranslation('validation.empty_data'));
+// });
 
 it('throws exception if rules are empty', function () {
     expect(fn () => new Validator(['name' => 'John'], []))