update

Author: tamedevelopers

src/Traits/ValidatorTrait.php

@@ -22,7 +22,7 @@ trait ValidatorTrait {
     private function callback($closure = null)
     {
         if(Tame::isClosure($closure)){
-           return $closure($this);
+            return $closure($this);
         }
     }
 

src/Validator.php

@@ -122,37 +122,29 @@ public function validate($closure = null)
 
     /**
      * Form save response
-     * 
+     *
      * @param  Closure  $function
      * @return mixed
      */
     public function save($closure)
     {
-        // if validation already failed, send stored JsonResponse now
+        // if validation already failed, return stored JsonResponse
         if (ValidatorMethod::isJsonResponse($this->jsonResponse)) {
-            // Send headers/body only once and return response for frameworks/tests
-            if (!$this->responseSent) {
-                $this->jsonResponse->send();
-                $this->responseSent = true;
-            }
             return $this->jsonResponse;
         }
 
         if($this->isValidated()){
-            
+
             // save into a remembering variable
             ValidatorMethod::resolveFlash($this);
-            
+
             $response = $this->callback($closure);
 
-            // If user returns a JsonResponse in save, send and return it
+            // If user returns a JsonResponse in save, return it
             if (ValidatorMethod::isJsonResponse($response)) {
-                if (!$this->responseSent) {
-                    $response->send();
-                    $this->responseSent = true;
-                }
+                return $response;
             }
-            
+
             // delete csrf session token
             CsrfToken::unsetToken();
         }

tests/server.php

@@ -16,7 +16,7 @@
     "enum:terms"        => 'Accept terms and condition',
 ])->validate(function($response){
 
-    return $response->json(1, $response->message);
+    // return $response->json(1, $response->message);
 
     var_dump(
         $response,