update

Author: tamedevelopers

src/Traits/ValidatorTrait.php

@@ -22,19 +22,19 @@ trait ValidatorTrait {
     private function callback($closure = null)
     {
         if(Tame::isClosure($closure)){
-            $closure($this);
+           return $closure($this);
         }
     }
 
     /**
      * Use form methods without actually submitting form
      * 
      * @param  Closure $closure
-     * @return void
+     * @return mixed
      */
     public function noInterface($closure)
     {
-        $this->callback($closure);
+        return $this->callback($closure);
     }
 
     /**
@@ -80,17 +80,41 @@ public function getForm($type = null)
         return ValidatorMethod::getForm($type);
     }
 
+    /**
+     * Return a JSON response with status code and message
+     *
+     * @param  int   $response
+     * @param  mixed $message
+     * @param  int   $statusCode
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     */
+    public static function json(int $response = 0, $message = null, int $statusCode = 200)
+    {
+        return Tame::json($response, $message, $statusCode);
+    }
+
+    /**
+     * Alias for `echoJson` method
+     * 
+     * @param  int $response
+     * @param  mixed  $message 
+     * @return mixed<json>
+     */
+    public static function jsonEcho(int $response = 0, $message = null)
+    {
+        self::echoJson($response, $message);
+    }
+
     /**
      * Returns encoded JSON object of response and message
      * 
-     * @param  int|float  $response
+     * @param  int $response
      * @param  mixed  $message 
-     * @return string
-     * - [json]  
+     * @return mixed<json>  
      */
-    public function echoJson(?int $response = 0, $message = null)
+    public static function echoJson(int $response = 0, $message = null)
     {
-        return Tame::echoJson($response, $message);
+        Tame::jsonEcho($response, $message);
     }
 
     /**

src/Validator.php

@@ -37,6 +37,9 @@ class Validator implements ValidatorInterface
         PropertyTrait,
         ValidateSuccessTrait;
 
+
+    public $jsonResponse = null;
+
     /**
      * @param  mixed $attribute
      * - Any outside parameter you would want to use within the form instance
@@ -109,7 +112,13 @@ public function validate($closure = null)
             // save into a remembering variable
             ValidatorMethod::resolveFlash($this);
 
-            $this->callback($closure);
+            // run callback, which should return JsonResponse
+            $response = $this->callback($closure);
+
+            // Instead of returning the JsonResponse, keep chaining
+            if ($response instanceof \Symfony\Component\HttpFoundation\JsonResponse) {
+                $this->jsonResponse = $response;
+            }
         }
 
         return $this;
@@ -119,10 +128,15 @@ public function validate($closure = null)
      * Form save response
      * 
      * @param  Closure  $function
-     * @return $this
+     * @return mixed
      */
     public function save($closure)
     {
+        // if validation already failed, stop here
+        if ($this->jsonResponse instanceof \Symfony\Component\HttpFoundation\JsonResponse) {
+            return $this->jsonResponse;
+        }
+
         if($this->isValidated()){
 
             // save into a remembering variable
@@ -133,8 +147,6 @@ public function save($closure)
             // delete csrf session token
             CsrfToken::unsetToken();
         }
-
-        return $this;
     }
 
     /**

src/helpers.php

@@ -6,12 +6,6 @@
 use Tamedevelopers\Validator\Methods\ValidatorMethod;
 
 
-/**
- * Helps without calling the method multiple times
- */
-$Tame_isAppFramework = function_exists('Tame_isAppFramework') ? Tame_isAppFramework() : false;
-
-
 if (! function_exists('form')) {
 
     /**
@@ -27,7 +21,7 @@ function form($attribute = null)
     }
 }
 
-if (! $Tame_isAppFramework && ! function_exists('old')) {
+if (! Tame_isAppFramework() && ! function_exists('old')) {
 
     /**
      * Return previously entered value
@@ -89,7 +83,7 @@ function config_form(?bool $error_type = false, ?bool $csrf_token = true, $reque
     }
 }
 
-if (! $Tame_isAppFramework && ! function_exists('csrf_token')) {
+if (! Tame_isAppFramework() && ! function_exists('csrf_token')) {
 
     /**
      * Get Csrf Token
@@ -102,7 +96,7 @@ function csrf_token()
     }
 }
 
-if (! $Tame_isAppFramework && ! function_exists('csrf')) {
+if (! Tame_isAppFramework() && ! function_exists('csrf')) {
 
     /**
      * Generate Input for Csrf Token