update

Author: tamedevelopers

src/Traits/PropertyTrait.php

@@ -6,84 +6,49 @@
 
 trait PropertyTrait {
 
-    /**
-     * param
-     */ 
+    /** @var mixed form param data */ 
     public $param; 
 
-    /**
-     * attribute 
-     * @var mixed
-     */
-    public $attribute;
+    /** @var mixed attribute */
+    protected $attribute;
 
-    /**
-     * public message notice
-     * @var mixed
-     */
+    /** @var mixed public message data */
     public $message;
 
+    /** @var array Defined rules collectors */
+    private $rules = [];
+
     /** @var \Symfony\Component\HttpFoundation\JsonResponse|null */
-    public $jsonResponse = null;
+    public $jsonResponse;
 
     /** Flag to avoid double-sending responses */
     protected bool $responseSent = false;
 
-    /**
-     * Defined rules collectors
-     *
-     * @var array
-     */
-    private $rules = [];
-
-    /**
-     * Keep track of manually calling the validate method
-     *
-     * @var bool
-     */
+    /** @var bool Keep track of manually calling the validate method */
     private $isValidatedCalled = false;
 
-
-    /**
-     * proceed
-     * @var bool
-     */
+    /** @var bool proceed */
     public $flashVerify;
 
-    /**
-     * proceed
-     * @var bool
-     */
+    /** @var bool proceed */
     private $proceed;
 
-    /**
-     * error 
-     * @var bool
-     */
+    /** @var bool error */
     private $error = false;
 
-    /**
-     * flash
-     * @var array
-     */
+    /** @var array flash data */
     public $flash = [
         'message'   => [],
         'class'     => '',
     ];
 
-    /**
-     * error class
-     * @var array
-     */
+    /** @var array style class */
     public $class = [
         'success'   => 'alert alert-success',
         'error'     => 'alert alert-danger',
     ];
 
-    /**
-     * error class
-     * @var array
-     */
+    /** @var array error configuration */
     public $config = [
         'csrf'      => true,
         'operator'  => false,

src/Validator.php

@@ -122,29 +122,37 @@ public function validate($closure = null)
 
     /**
      * Form save response
-     *
+     * 
      * @param  Closure  $function
      * @return mixed
      */
     public function save($closure)
     {
-        // if validation already failed, return stored JsonResponse
+        // If user returns a JsonResponse
         if (ValidatorMethod::isJsonResponse($this->jsonResponse)) {
-            return $this->jsonResponse;
+            return $this->jsonResponse->send();
         }
 
         if($this->isValidated()){
-
+            
             // save into a remembering variable
             ValidatorMethod::resolveFlash($this);
-
+            
             $response = $this->callback($closure);
 
-            // If user returns a JsonResponse in save, return it
+            dd(
+                'sss'
+            );
+            exit();
+
+            // If user returns a JsonResponse in save, send and return it
             if (ValidatorMethod::isJsonResponse($response)) {
-                return $response;
+                if (!$this->responseSent) {
+                    $response->send();
+                    $this->responseSent = true;
+                }
             }
-
+            
             // delete csrf session token
             CsrfToken::unsetToken();
         }
@@ -265,6 +273,16 @@ public function merge($keys = null, $data = null)
         return ValidatorMethod::merge($keys, $data);
     }
 
+    /**
+     * Get Attribute Data
+     * 
+     * @return mixed
+     */
+    public function getAttribute()
+    {
+        return $this->attribute;
+    }
+
     /**
      * Return previously entered value
      * 

tests/server.php

@@ -3,7 +3,7 @@
 include_once __DIR__ . "/include.php";
 
 
-$form->token(true)->error(false)->rules([
+$result = $form->token(true)->error(false)->rules([
     "string|name"       => 'Please enter a name',
     "str_len|name|<|5"  => 'Name should be more than five(5) characters',
     "email|email"       => 'Please enter a valid email address',
@@ -16,26 +16,19 @@
     "enum:terms"        => 'Accept terms and condition',
 ])->validate(function($response){
 
-    // return $response->json(1, $response->message);
-
-    var_dump(
-        $response,
-        'sss'
-    );
-    exit();
+    return $response->json(1, $response->message);
 })->save(function($response){
     // access the form data
     $param = $response->param;
 
     // access parent scope data\ $data
     $attribute = $response->attribute;
 
-    // message
-    $response->message = "Submitted Successfully";
+    // dump(
+    //     // $param->message,
+    //     $param->toArray(),
+    // );
 
-    dump(
-        // $param->message,
-        $param->toArray(),
-    );
+    return $response->json(0, "Submitted Successfully");
 });