config as object

packaged · Aug 24, 2020 · e21760a · e21760a
1 parent 97fa476
commit e21760a
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/Validators/RemoteValidator.php b/src/Validators/RemoteValidator.php
@@ -7,6 +7,7 @@
 use Packaged\Validate\IValidator;
 use Packaged\Validate\SerializableValidator;
 use Packaged\Validate\Validation;
+use stdClass;
 
 class RemoteValidator extends AbstractSerializableValidator implements IDataSetValidator
 {
@@ -24,8 +25,8 @@ public static function deserialize($configuration): SerializableValidator
     $validator->_validators = $configuration->validators;
     foreach($validator->_validators as $k => $v)
     {
-      $validator->_validators[$k]['validator'] = Validation::fromJsonObject($v['validator']);
-      $validator->_validators[$k]['remoteValidator'] = Validation::fromJsonObject($v['remoteValidator']);
+      $validator->_validators[$k]->validator = Validation::fromJsonObject($v->validator);
+      $validator->_validators[$k]->remoteValidator = Validation::fromJsonObject($v->remoteValidator);
     }
     return $validator;
   }
@@ -48,13 +49,13 @@ protected function _doValidate($values): Generator
     $secondary = [];
     foreach($this->_validators as $validator)
     {
-      if($validator['remoteValidator']->isValid($values[$validator['remoteField']] ?? null))
+      if($validator->remoteValidator->isValid($values[$validator->remoteField] ?? null))
       {
         if(!isset($secondary[$this->_field]))
         {
           $secondary[$this->_field] = [];
         }
-        $secondary[$this->_field][] = $validator['validator'];
+        $secondary[$this->_field][] = $validator->validator;
       }
     }
 
@@ -64,19 +65,22 @@ protected function _doValidate($values): Generator
       foreach($validators as $validator)
       {
         /** @var IValidator $validator */
-        yield $validator->validate($fieldValue);
+        foreach($validator->validate($fieldValue) as $error)
+        {
+          yield $error;
+        }
       }
     }
   }
 
   //Validate field if remote validator passes
   public function addValidator(IValidator $validator, string $remoteField, IValidator $remoteValidator)
   {
-    $this->_validators[] = [
-      'validator'       => $validator,
-      'remoteField'     => $remoteField,
-      'remoteValidator' => $remoteValidator,
-    ];
+    $config = new stdClass();
+    $config->validator = $validator;
+    $config->remoteField = $remoteField;
+    $config->remoteValidator = $remoteValidator;
+    $this->_validators[] = $config;
     return $this;
   }
 }