[UPD] remove useless field value on constructor, it will be get from …

…data_source.
kivudesign · Dec 8, 2022 · 16e96b2 · 16e96b2
1 parent a45f545
commit 16e96b2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/src/Validate.php b/src/Validate.php
@@ -60,7 +60,7 @@ function check(array $resource, array $schema){
 
                     $reflexion = new ReflectionClass($class_name);
 
-                    $instance = $reflexion->newInstance($item, $value,$resource);
+                    $instance = $reflexion->newInstance($item,$resource);
 
                     foreach ($rules[$key] as $method => $params){
                         if(method_exists($instance,$method)){

diff --git a/src/Validator/BooleanValidator.php b/src/Validator/BooleanValidator.php
@@ -22,15 +22,15 @@
 final class BooleanValidator extends ValidatorProvider
 {
 
-    function __construct(string $string_item,string $value,array $source)
+    function __construct(string $item, array $source)
     {
-        $this->field_name = $string_item;
+        $this->field_name = $item;
         $this->data_source = $source;
         $this->field_value = $source[$this->field_name];
         $this->class_provider = "boolean";
 
         if ($this->isBoolean()) {
-            $this->field_value = $source[$string_item];
+            $this->field_value = $source[$item];
         };
         parent::__construct();
     }

diff --git a/src/Validator/DateValidator.php b/src/Validator/DateValidator.php
@@ -17,10 +17,10 @@
 final class DateValidator extends ValidatorProvider
 {
 
-    public function __construct(string $item,string $value,array $source ) {
-        $this->field_value = $source[$item];
+    public function __construct(string $item,array $data_source ) {
         $this->field_name = $item;
-        $this->data_source = $source;
+        $this->field_value = $data_source[$item];
+        $this->data_source = $data_source;
         $this->class_provider = "date";
         $this->checkExist();
         parent::__construct();

diff --git a/src/Validator/NumberValidator.php b/src/Validator/NumberValidator.php
@@ -21,13 +21,13 @@
  */
 final class NumberValidator extends ValidatorProvider {
 
-    function __construct(string $string_item,string $value,array $source) {
-        $this->data_source = $source;
-        $this->field_name = $string_item;
-        $this->field_value= $value;
+    function __construct(string $item, array $data_source) {
+        $this->data_source = $data_source;
+        $this->field_name = $item;
+        $this->field_value = $data_source[$item];
         $this->class_provider = "number";
         if($this->isNumber()){
-            $this->field_value = $source[$string_item];
+            $this->field_value = $data_source[$item];
         }
         parent::__construct();
     }

diff --git a/src/Validator/StringValidator.php b/src/Validator/StringValidator.php
@@ -16,15 +16,14 @@
 final class StringValidator extends ValidatorProvider {
     /**
      *
-     * @param string $item  the item to be validated.
-     * @param string $value  the value of the item
-     * @param array $data_source  the source data from where is going to check it the match key exist and have value.
+     * @param string $item the item to be validated.
+     * @param array $data_source the source data from where is going to check it the match key exist and have value.
      */
-    public function __construct(string $item, string $value, array $data_source=[]) {
+    public function __construct(string $item, array $data_source=[]) {
         $this->errors = [];
         $this->data_source = $data_source;
         $this->field_name = $item;
-        $this->field_value = $value;
+        $this->field_value = $data_source[$item];
         $this->class_provider = "string";
         parent::__construct();
     }