Refactoring

hakobyansen · Jan 20, 2019 · a6b2765 · a6b2765
1 parent 2b3bb8a
commit a6b2765
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/Core/RBValidator.php b/src/Core/RBValidator.php
@@ -2,25 +2,21 @@
 
 namespace RB\Core;
 
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Validator;
 
 class RBValidator
 {
     use ValidatorTrait;
 
     /**
-     * @param $data
-     * @param $rules
-     * @param $messages
-     * @return true
+     * @param Validator $validator
+     * @return bool
      */
-    public static function validate( $data, $rules, $messages = [] )
+    public static function validate( Validator $validator ): bool
     {
-        $Validator = Validator::make( $data, $rules, $messages );
-
-        if( $Validator->fails() )
+        if( $validator->fails() )
         {
-            self::throwResponseException( $Validator );
+            self::throwResponseException( $validator );
         }
 
         return true;

diff --git a/tests/unit/RBValidatorTest.php b/tests/unit/RBValidatorTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Illuminate\Support\Facades\Validator;
 use Orchestra\Testbench\TestCase;
 use RB\Core\RBValidator;
 
@@ -33,6 +34,8 @@ public function testValidate()
             'city' => 'required'
         ];
 
-        $this->assertTrue(  RBValidator::validate( $data, $rules ) );
+        $validator = Validator::make( $data, $rules );
+
+        $this->assertTrue(  RBValidator::validate( $validator ) );
     }
 }