RunnerLee / validator

src/Validator.php

Spacing +24 added lines, -24 removed lines

@@ -20,32 +20,32 @@ 
     /**
      * @var array
      */
-    protected $data = [];
+    protected $data = [ ];
 
     /**
      * @var array
      */
-    protected $ruleGroups = [];
+    protected $ruleGroups = [ ];
 
     /**
      * @var array
      */
-    protected $messages = [];
+    protected $messages = [ ];
 
     /**
      * @var array
      */
-    protected static $forceRules = ['Required', 'RequiredIf', 'RequiredWith', 'RequiredUnless', 'RequiredWithout'];
+    protected static $forceRules = [ 'Required', 'RequiredIf', 'RequiredWith', 'RequiredUnless', 'RequiredWithout' ];
 
     /**
      * @var array
      */
-    protected static $extensions = [];
+    protected static $extensions = [ ];
 
     /**
      * @var array
      */
-    protected static $extensionTemplates = [];
+    protected static $extensionTemplates = [ ];
 
     /**
      * Validator constructor.
@@ -55,7 +55,7 @@ 
      * @param array  $customMessages
      * @param string $file
      */
-    public function __construct(array $data, array $rules, array $customMessages = [], $file = __DIR__.'/messages/en.php')
+    public function __construct(array $data, array $rules, array $customMessages = [ ], $file = __DIR__.'/messages/en.php')
     {
         $this->data = $data;
         $this->parseRules($rules);
@@ -72,11 +72,11 @@ 
     {
         $name = self::formatRuleName($name);
 
-        self::$extensions[$name] = $callback;
+        self::$extensions[ $name ] = $callback;
 
-        $isForce && self::$forceRules[] = $name;
+        $isForce && self::$forceRules[ ] = $name;
 
-        !empty($message) && (static::$extensionTemplates[$name] = $message);
+        !empty($message) && (static::$extensionTemplates[ $name ] = $message);
     }
 
     /**
@@ -89,14 +89,14 @@ 
                 $value = $this->getField($field);
                 foreach ($rules as $rule => $parameters) {
                     if (!$this->runValidateRule($field, $value, $rule, $parameters)) {
-                        $this->messages[$field][$rule] = $this->buildMessage($rule, $field, $parameters);
+                        $this->messages[ $field ][ $rule ] = $this->buildMessage($rule, $field, $parameters);
                     }
                 }
             } elseif ($forceRules = array_intersect(self::$forceRules, array_keys($rules))) {
                 $value = null;
                 foreach ($forceRules as $rule) {
-                    if (!$this->runValidateRule($field, null, $rule, $rules[$rule])) {
-                        $this->messages[$field][$rule] = $this->buildMessage($rule, $field, $rules[$rule]);
+                    if (!$this->runValidateRule($field, null, $rule, $rules[ $rule ])) {
+                        $this->messages[ $field ][ $rule ] = $this->buildMessage($rule, $field, $rules[ $rule ]);
                     }
                 }
             }
@@ -134,13 +134,13 @@ 
      */
     protected function parseRules(array $ruleGroups)
     {
-        $map = [];
+        $map = [ ];
         foreach ($ruleGroups as $field => $rules) {
             foreach (explode('|', $rules) as $rule) {
                 list($rule, $parameters) = explode(':', (false === strpos($rule, ':') ? ($rule.':') : $rule), 2);
-                !isset($map[$rule]) && $map[$rule] = self::formatRuleName($rule);
-                $rule = $map[$rule];
-                $this->ruleGroups[$field][$rule] = ('' === $parameters ? [] : explode(',', $parameters));
+                !isset($map[ $rule ]) && $map[ $rule ] = self::formatRuleName($rule);
+                $rule = $map[ $rule ];
+                $this->ruleGroups[ $field ][ $rule ] = ('' === $parameters ? [ ] : explode(',', $parameters));
             }
         }
         unset($map);
@@ -156,7 +156,7 @@ 
         return implode(
             '',
             array_map(
-                function ($value) {
+                function($value) {
                     return ucfirst($value);
                 },
                 explode('_', $name)
@@ -176,13 +176,13 @@ 
         if (!array_key_exists($item, $this->data)) {
             return false;
         }
-        $value = $this->data[$item];
+        $value = $this->data[ $item ];
 
         foreach ($field as $item) {
             if (!array_key_exists($item, $value)) {
                 return false;
             }
-            $value = $value[$item];
+            $value = $value[ $item ];
         }
 
         return true;
@@ -197,9 +197,9 @@ 
     {
         $field = explode('.', $field);
         $item = array_shift($field);
-        $value = $this->data[$item];
+        $value = $this->data[ $item ];
         foreach ($field as $item) {
-            $value = $value[$item];
+            $value = $value[ $item ];
         }
 
         return $value;
@@ -213,9 +213,9 @@ 
      *
      * @return bool
      */
-    protected function runValidateRule($field, $value, $rule, array $parameters = [])
+    protected function runValidateRule($field, $value, $rule, array $parameters = [ ])
     {
-        $callback = array_key_exists($rule, self::$extensions) ? self::$extensions[$rule] : [$this, "validate{$rule}"];
+        $callback = array_key_exists($rule, self::$extensions) ? self::$extensions[ $rule ] : [ $this, "validate{$rule}" ];
 
         return (bool) call_user_func($callback, $field, $value, $parameters, $this);
     }

src/Concerns/ValidatesAttributes.php

Spacing +26 added lines, -26 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function validateAccept($field, $value, array $parameters, Validator $validator)
     {
-        return in_array(strtolower($value), ['yes', 'on', '1', 1, true], true);
+        return in_array(strtolower($value), [ 'yes', 'on', '1', 1, true ], true);
     }
 
     /**
@@ -73,8 +73,8 @@ 
      */
     public function validateSize($field, $value, array $parameters, Validator $validator)
     {
-        $size = filter_var($parameters[0], FILTER_VALIDATE_INT);
-        false === $size && $size = filter_var($parameters[0], FILTER_VALIDATE_FLOAT);
+        $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_INT);
+        false === $size && $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_FLOAT);
 
         return $this->getSize($field, $value) === $size;
     }
@@ -102,7 +102,7 @@ 
      */
     public function validateBoolean($field, $value, array $parameters, Validator $validator)
     {
-        return in_array($value, [true, false, 0, 1, '0', '1'], true);
+        return in_array($value, [ true, false, 0, 1, '0', '1' ], true);
     }
 
     /**
@@ -115,7 +115,7 @@ 
      */
     public function validateConfirm($field, $value, array $parameters, Validator $validator)
     {
-        return $value === $this->data[$parameters[0]];
+        return $value === $this->data[ $parameters[ 0 ] ];
     }
 
     /**
@@ -169,7 +169,7 @@ 
      */
     public function validateRequiredWith($field, $value, array $parameters, Validator $validator)
     {
-        return !is_null($value) || !array_key_exists($parameters[0], $this->data);
+        return !is_null($value) || !array_key_exists($parameters[ 0 ], $this->data);
     }
 
     /**
@@ -182,7 +182,7 @@ 
      */
     public function validateRequiredWithout($field, $value, array $parameters, Validator $validator)
     {
-        return !is_null($value) || array_key_exists($parameters[0], $this->data);
+        return !is_null($value) || array_key_exists($parameters[ 0 ], $this->data);
     }
 
     /**
@@ -198,7 +198,7 @@ 
         $otherField = array_shift($parameters);
 
         return !is_null($value) || (
-                !array_key_exists($otherField, $this->data) || false === array_search($this->data[$otherField], $parameters)
+                !array_key_exists($otherField, $this->data) || false === array_search($this->data[ $otherField ], $parameters)
             );
     }
 
@@ -215,7 +215,7 @@ 
         $otherField = array_shift($parameters);
 
         return !is_null($value) || (
-                !array_key_exists($otherField, $this->data) || false !== array_search($this->data[$otherField], $parameters)
+                !array_key_exists($otherField, $this->data) || false !== array_search($this->data[ $otherField ], $parameters)
             );
     }
 
@@ -267,7 +267,7 @@ 
      */
     public function validateMin($field, $value, array $parameters, Validator $validator)
     {
-        return $this->getSize($field, $value) >= $parameters[0];
+        return $this->getSize($field, $value) >= $parameters[ 0 ];
     }
 
     /**
@@ -280,7 +280,7 @@ 
      */
     public function validateMax($field, $value, array $parameters, Validator $validator)
     {
-        return $this->getSize($field, $value) <= $parameters[0];
+        return $this->getSize($field, $value) <= $parameters[ 0 ];
     }
 
     /**
@@ -294,25 +294,25 @@ 
     public function validateRange($field, $value, array $parameters, Validator $validator)
     {
         $size = $this->getSize($field, $value);
-        if (!isset($parameters[0])) {
+        if (!isset($parameters[ 0 ])) {
             return false;
         }
-        if (isset($parameters[1])) {
-            if ('' === $parameters[0]) {
-                if ('' === $parameters[1]) {
+        if (isset($parameters[ 1 ])) {
+            if ('' === $parameters[ 0 ]) {
+                if ('' === $parameters[ 1 ]) {
                     return false;
                 }
 
-                return $size <= $parameters[1];
+                return $size <= $parameters[ 1 ];
             }
-            if ('' === $parameters[1]) {
-                return $size >= $parameters[0];
+            if ('' === $parameters[ 1 ]) {
+                return $size >= $parameters[ 0 ];
             }
 
-            return $size >= $parameters[0] && $size <= $parameters[1];
+            return $size >= $parameters[ 0 ] && $size <= $parameters[ 1 ];
         }
 
-        return '' === $parameters[0] ? false : ($size >= $parameters[0]);
+        return '' === $parameters[ 0 ] ? false : ($size >= $parameters[ 0 ]);
     }
 
     /**
@@ -325,7 +325,7 @@ 
      */
     public function validateRegex($field, $value, array $parameters, Validator $validator)
     {
-        return (bool) preg_match($parameters[0], $value);
+        return (bool) preg_match($parameters[ 0 ], $value);
     }
 
     /**
@@ -364,7 +364,7 @@ 
      */
     public function validateDateFormat($field, $value, array $parameters, Validator $validator)
     {
-        return !(bool) date_parse_from_format($parameters[0], $value)['error_count'];
+        return !(bool) date_parse_from_format($parameters[ 0 ], $value)[ 'error_count' ];
     }
 
     /**
@@ -377,7 +377,7 @@ 
      */
     public function validateDateBefore($field, $value, array $parameters, Validator $validator)
     {
-        return strtotime($value) < strtotime($parameters[0]);
+        return strtotime($value) < strtotime($parameters[ 0 ]);
     }
 
     /**
@@ -390,7 +390,7 @@ 
      */
     public function validateDateAfter($field, $value, array $parameters, Validator $validator)
     {
-        return strtotime($value) > strtotime($parameters[0]);
+        return strtotime($value) > strtotime($parameters[ 0 ]);
     }
 
     /**
@@ -418,7 +418,7 @@ 
     {
         $specifyField = array_shift($parameters);
 
-        return array_key_exists($specifyField, $this->data) && $value !== $this->data[$specifyField];
+        return array_key_exists($specifyField, $this->data) && $value !== $this->data[ $specifyField ];
     }
 
     /**
@@ -430,7 +430,7 @@ 
     public function getSize($field, $value)
     {
         switch (true) {
-            case isset($this->ruleGroups[$field]['String']) && is_string($value):
+            case isset($this->ruleGroups[ $field ][ 'String' ]) && is_string($value):
                 return strlen($value);
             case is_array($value):
                 return count($value);

src/Concerns/MessagesAttributes.php

Spacing +6 added lines, -6 removed lines

@@ -11,15 +11,15 @@ 
 
 trait MessagesAttributes
 {
-    protected $templates = [];
+    protected $templates = [ ];
 
-    protected function loadMessageTemplate($file, array $customMessage = [])
+    protected function loadMessageTemplate($file, array $customMessage = [ ])
     {
         $this->templates = require $file;
         $this->templates = array_merge($this->templates, self::$extensionTemplates);
 
         foreach ($customMessage as $rule => $template) {
-            $this->templates[self::formatRuleName($rule)] = $template;
+            $this->templates[ self::formatRuleName($rule) ] = $template;
         }
     }
 
@@ -30,12 +30,12 @@ 
      *
      * @return string
      */
-    protected function buildMessage($rule, $field, array $parameters = [])
+    protected function buildMessage($rule, $field, array $parameters = [ ])
     {
-        if (!isset($this->templates[$rule])) {
+        if (!isset($this->templates[ $rule ])) {
             return "{$field} field check failed";
         }
-        array_unshift($parameters, "{$field} {$this->templates[$rule]}");
+        array_unshift($parameters, "{$field} {$this->templates[ $rule ]}");
 
         try {
             return sprintf(...$parameters);