pass data

packaged · Aug 24, 2020 · 2944713 · 2944713
1 parent cb5c3d7
commit 2944713
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/DataHandlers/AbstractDataHandler.php b/src/DataHandlers/AbstractDataHandler.php
@@ -5,7 +5,6 @@
 use Packaged\Form\DataHandlers\Interfaces\DataHandler;
 use Packaged\Form\Decorators\AbstractDataHandlerDecorator;
 use Packaged\Form\Decorators\Interfaces\DataHandlerDecorator;
-use Packaged\Form\Form\Form;
 use Packaged\Helpers\Strings;
 use Packaged\SafeHtml\ISafeHtmlProducer;
 use Packaged\Validate\IDataSetValidator;
@@ -181,13 +180,13 @@ public function clearErrors()
   /**
    * Validate the data, throwing an exception with the error
    *
-   * @param mixed     $value
-   * @param Form|null $form
+   * @param mixed $value
+   * @param array $data
    *
    * @return ValidationException[]
    * @throws RuntimeException
    */
-  public function validateValue($value, ?Form $form = null): array
+  public function validateValue($value, array $data = []): array
   {
     $this->_initValidator();
     $errors = [];
@@ -197,11 +196,11 @@ public function validateValue($value, ?Form $form = null): array
       {
         if($validator instanceof IDataSetValidator)
         {
-          if(!$form)
+          if(!$data)
           {
             throw new RuntimeException('no form provided to dataset validator');
           }
-          $validatorErrors = $validator->validate($form->getFormData());
+          $validatorErrors = $validator->validate($data);
         }
         else
         {

diff --git a/src/DataHandlers/Interfaces/DataHandler.php b/src/DataHandlers/Interfaces/DataHandler.php
@@ -2,7 +2,6 @@
 namespace Packaged\Form\DataHandlers\Interfaces;
 
 use Exception;
-use Packaged\Form\Form\Form;
 use Packaged\SafeHtml\ISafeHtmlProducer;
 use Packaged\Validate\IValidatable;
 use Packaged\Validate\ValidationException;
@@ -25,12 +24,12 @@ public function isValidValue($value): bool;
   /**
    * Validate the data, return array of errors
    *
-   * @param mixed     $value
-   * @param Form|null $form
+   * @param mixed $value
+   * @param array $data additional data that may be required by some validators, eg. form data
    *
    * @return array
    */
-  public function validateValue($value, ?Form $form = null): array;
+  public function validateValue($value, array $data = []): array;
 
   /**
    * Validate the data, throwing an exception with the error

diff --git a/src/Form/Form.php b/src/Form/Form.php
@@ -116,7 +116,7 @@ public function validate(): array
     $keyedErrors = [];
     foreach($this->_dataHandlers as $name => $handler)
     {
-      $handlerErrors = $handler->validateValue($handler->getValue(), $this);
+      $handlerErrors = $handler->validateValue($handler->getValue(), $this->getFormData());
       if($handlerErrors)
       {
         $keyedErrors[$name] = $handlerErrors;
@@ -154,7 +154,7 @@ public function hydrate(array $data, $hydrateInvalidValues = false)
       if($ele instanceof DataHandler)
       {
         $value = $ele->formatValue($value);
-        $handlerErrors = $ele->validateValue($value, $this);
+        $handlerErrors = $ele->validateValue($value, array_merge($this->getFormData(), $data));
         if(empty($handlerErrors))
         {
           $ele->setValue($value);