styleci fixes

src/Javascript/MessageParser.php

@@ -16,7 +16,7 @@ class MessageParser
      * @var bool
      */
     protected $escape;
-    
+
     /**
      * Create a new JsValidation instance.
      *

src/JsValidatorFactory.php

@@ -10,6 +10,7 @@
 use Proengsoft\JsValidation\Javascript\RuleParser;
 use Proengsoft\JsValidation\Javascript\ValidatorHandler;
 use Proengsoft\JsValidation\Support\DelegatedValidator;
+use Proengsoft\JsValidation\Support\FormRequestParser;
 use Proengsoft\JsValidation\Support\ValidationRuleParserProxy;
 
 class JsValidatorFactory
@@ -132,21 +133,6 @@ public function formRequest($formRequest, $selector = null)
         return $this->validator($validator, $selector);
     }
 
-    /**
-     * @param string|array $class
-     * @return array
-     */
-    protected function parseFormRequestName($class)
-    {
-        $params = [];
-        if (is_array($class)) {
-            $params = empty($class[1]) ? $params : $class[1];
-            $class = $class[0];
-        }
-
-        return [$class, $params];
-    }
-
     /**
      * Creates and initializes an Form Request instance.
      *
@@ -157,14 +143,10 @@ protected function parseFormRequestName($class)
      */
     protected function createFormRequest($class)
     {
-        /*
-         * @var $formRequest \Illuminate\Foundation\Http\FormRequest
-         * @var $request Request
-         */
-        list($class, $params) = $this->parseFormRequestName($class);
+        $parser = new FormRequestParser($class);
 
         $request = $this->app->__get('request');
-        $formRequest = $this->app->build($class, $params);
+        $formRequest = $this->app->make($parser->className(), $parser->params());
 
         if ($session = $request->getSession()) {
             $formRequest->setLaravelSession($session);

src/Remote/Validator.php

@@ -2,14 +2,14 @@
 
 namespace Proengsoft\JsValidation\Remote;
 
-use Illuminate\Support\Arr;
+use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\ValidationRuleParser;
-use Proengsoft\JsValidation\Support\RuleListTrait;
-use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Validation\Validator as BaseValidator;
 use Proengsoft\JsValidation\Support\AccessProtectedTrait;
+use Proengsoft\JsValidation\Support\RuleListTrait;
 
 class Validator
 {

src/Support/FormRequestParser.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Proengsoft\JsValidation\Support;
+
+class FormRequestParser
+{
+    /**
+     * @var string
+     */
+    protected $className;
+
+    /**
+     * @var array
+     */
+    protected $params;
+
+    /**
+     * FormRequestParser constructor.
+     *
+     * @param string|array $request
+     */
+    public function __construct($request)
+    {
+        $this->split($request);
+    }
+
+    /**
+     * Form request class.
+     *
+     * @return string
+     */
+    public function className()
+    {
+        return $this->className;
+    }
+
+    /**
+     * Parameters to pass to the form request.
+     *
+     * @return array
+     */
+    public function params()
+    {
+        return $this->params;
+    }
+
+    /**
+     * Split the form request.
+     *
+     * @param $request
+     * @return $this
+     */
+    protected function split($request)
+    {
+        $params = [];
+        if (is_array($request)) {
+            $params = empty($request[1]) ? $params : $request[1];
+            $request = $request[0];
+        }
+
+        $this->className = $request;
+        $this->params    = $params;
+
+        return $this;
+    }
+}