mrferos / comfort

src/Validator/AbstractValidator.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace Comfort\Validator;
 
 use Comfort\Comfort;
-use Comfort\Error;
 use Comfort\Exception\ValidationException;
 use Comfort\ValidationError;
 

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
     {
         $this->optional = false;
 
-        $this->add(function ($value, $nameKey) {
+        $this->add(function($value, $nameKey) {
             if (is_null($value)) {
                 $this->createError('required', $value, $nameKey);
             }
@@ -127,7 +127,7 @@ 
      */
     public function anyOf(array $vals)
     {
-        $this->add(function ($value, $nameKey) use ($vals) {
+        $this->add(function($value, $nameKey) use ($vals) {
             if (!in_array($value, $vals)) {
                 return $this->createError('anyof', $value, $nameKey);
             }
@@ -144,7 +144,7 @@ 
      */
     public function invalid(array $vals)
     {
-        return $this->add(function ($value, $nameKey) use ($vals) {
+        return $this->add(function($value, $nameKey) use ($vals) {
             if (in_array($value, $vals)) {
                 return $this->createError('invalid', $value, $nameKey);
             }
@@ -211,7 +211,7 @@ 
      */
     public function errorMessages(array $errorMessages)
     {
-        $errorMessages = array_map(function ($errorMessage) {
+        $errorMessages = array_map(function($errorMessage) {
             if (is_string($errorMessage)) {
                 $errorMessage = ['message' => $errorMessage];
             }
@@ -244,7 +244,7 @@ 
 
         $errorHandler = $this->errorHandlers[$key];
         if (!array_key_exists('message_formatter', $errorHandler)) {
-            $messageFormatter = function ($template, $value, $validationValue = null) {
+            $messageFormatter = function($template, $value, $validationValue = null) {
                 return sprintf($template, $value, $validationValue);
             };
         } else {

src/Validator/ArrayValidator.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
 
         $this->toBool(false);
 
-        $this->add(function ($value, $nameKey) {
+        $this->add(function($value, $nameKey) {
             if (!is_array($value)) {
                 return $this->createError('array.not_array', $value, $nameKey);
             }
@@ -53,7 +53,7 @@ 
      */
     public function keys(array $definition)
     {
-        return $this->add(function (&$value) use ($definition) {
+        return $this->add(function(&$value) use ($definition) {
             /**
              * @var string $key
              * @var AbstractValidator $validator
@@ -87,7 +87,7 @@ 
      */
     public function min($min)
     {
-        return $this->add(function ($value, $nameKey) use ($min) {
+        return $this->add(function($value, $nameKey) use ($min) {
             if (count($value) < $min) {
                 return $this->createError('array.min', $value, $nameKey);
             }
@@ -102,7 +102,7 @@ 
      */
     public function max($max)
     {
-        return $this->add(function ($value, $nameKey) use ($max) {
+        return $this->add(function($value, $nameKey) use ($max) {
             if (count($value) > $max) {
                 return $this->createError('array.max', $value, $nameKey);
             }
@@ -117,7 +117,7 @@ 
      */
     public function length($length)
     {
-        return $this->add(function ($value, $nameKey) use ($length) {
+        return $this->add(function($value, $nameKey) use ($length) {
             if (count($value) != $length) {
                 return $this->createError('array.length', $value, $nameKey);
             }
@@ -131,7 +131,7 @@ 
      */
     public function unique()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (md5(serialize($value)) != md5(serialize(array_unique($value)))) {
                 return $this->createError('array.unique', $value, $nameKey);
             }
@@ -147,7 +147,7 @@ 
      */
     public function items(AbstractValidator $definition)
     {
-        return $this->add(function ($value, $nameKey) use ($definition) {
+        return $this->add(function($value, $nameKey) use ($definition) {
             foreach ($value as $key => $val) {
                 $resp = $definition($val, $nameKey);
                 if ($resp instanceof ValidationError) {

src/Validator/DateValidator.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function format($format)
     {
-        return $this->add(function ($value, $namekey) use ($format) {
+        return $this->add(function($value, $namekey) use ($format) {
             $date = \DateTime::createFromFormat($format, $value);
             if (false === $date) {
                 return $this->createError('date.format', $value, $namekey);
@@ -27,7 +27,7 @@ 
      */
     public function min($date)
     {
-        return $this->add(function ($value, $nameKey) use ($date) {
+        return $this->add(function($value, $nameKey) use ($date) {
             $minDate = strtotime($date);
             $curDate = strtotime($value);
 
@@ -45,7 +45,7 @@ 
      */
     public function max($date)
     {
-        return $this->add(function ($value, $nameKey) use ($date) {
+        return $this->add(function($value, $nameKey) use ($date) {
             $maxDate = strtotime($date);
             $curDate = strtotime($value);
 
@@ -62,10 +62,10 @@ 
      */
     public function timestamp()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             try {
                 new \DateTime('@' . $value);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 return $this->createError('date.timestamp', $value, $nameKey);
             }
         });

src/Validator/JsonValidator.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
         $this->toBool(false);
 
-        $this->add(function ($value, $nameKey) {
+        $this->add(function($value, $nameKey) {
             json_decode($value);
             if (json_last_error() != JSON_ERROR_NONE) {
                 return $this->createError('json.invalid', $value, $nameKey);
@@ -32,7 +32,7 @@ 
      */
     public function keys(array $definition)
     {
-        return $this->add(function ($value, $nameKey) use ($definition) {
+        return $this->add(function($value, $nameKey) use ($definition) {
             $decodedValue = json_decode($value, true);
             $validation = $this->array()->keys($definition);
             return $validation($decodedValue);
@@ -47,7 +47,7 @@ 
      */
     public function items(AbstractValidator $definition)
     {
-        return $this->add(function ($value, $nameKey) use ($definition) {
+        return $this->add(function($value, $nameKey) use ($definition) {
             $decodedValue = json_decode($value, true);
             $validation = $this->array()->items($definition);
             return $validation($decodedValue);

src/Validator/NumberValidator.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function min($min)
     {
-        return $this->add(function ($value, $nameKey) use ($min) {
+        return $this->add(function($value, $nameKey) use ($min) {
             if ($value < $min) {
                 return $this->createError('number.min', $value, $nameKey);
             }
@@ -65,7 +65,7 @@ 
      */
     public function max($max)
     {
-        return $this->add(function ($value, $nameKey) use ($max) {
+        return $this->add(function($value, $nameKey) use ($max) {
             if ($value > $max) {
                 return $this->createError('number.max', $value, $nameKey);
             }
@@ -81,7 +81,7 @@ 
      */
     public function precision($precision)
     {
-        return $this->add(function ($value, $nameKey) use ($precision) {
+        return $this->add(function($value, $nameKey) use ($precision) {
             if (strlen(substr($value, strpos($value, '.') + 1)) != $precision) {
                 return $this->createError('number.precision', $value, $nameKey);
             }
@@ -95,7 +95,7 @@ 
      */
     public function positive()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if ($value < 0) {
                 return $this->createError('number.positive', $value, $nameKey);
             }
@@ -107,7 +107,7 @@ 
      */
     public function negative()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if ($value > 0) {
                 return $this->createError('number.negative', $value, $nameKey);
             }
@@ -121,7 +121,7 @@ 
      */
     public function isInt()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!is_int($value)) {
                 return $this->createError('number.is_int', $value, $nameKey);
             }
@@ -135,7 +135,7 @@ 
      */
     public function isFloat()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!is_float($value)) {
                 return $this->createError('number.is_float', $value, $nameKey);
             }
@@ -149,7 +149,7 @@ 
      */
     public function isNumber()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!is_numeric($value)) {
                 return $this->createError('number.is_numeric', $value, $nameKey);
             }

src/Validator/Helper/AnyOfTrait.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function anyOf(array $vals)
     {
-        $this->add(function ($value, $nameKey) use ($vals) {
+        $this->add(function($value, $nameKey) use ($vals) {
             if (!in_array($value, $vals)) {
                 return $this->createError('anyof', $value, $nameKey);
             }

src/Validator/Helper/AlternativesTrait.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      */
     private function orMethod($conditions)
     {
-        return $this->add(function ($value, $nameKey) use ($conditions) {
+        return $this->add(function($value, $nameKey) use ($conditions) {
             $errors = [];
             foreach ($conditions as $condition) {
                 if (!$condition instanceof AbstractValidator) {
@@ -58,7 +58,7 @@ 
      */
     private function ifThenElse($conditions)
     {
-        return $this->add(function ($value, $nameKey) use ($conditions) {
+        return $this->add(function($value, $nameKey) use ($conditions) {
 
             foreach ($conditions as $condition) {
                 if (!isset($condition['is'])) {

src/Validator/Helper/ExecutorTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
      * Execute the validation stack and fail on first
      *
      * @param $value
-     * @param null $key
+     * @param null|string $key
      * @return bool|ValidationError|null
      */
     protected function validate($value, $key = null)

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
             } while (next($this->validationStack));
 
             return $value;
-        } catch (ValidationException $validationException) {
+        }catch (ValidationException $validationException) {
             if ($this->toBool) {
                 return false;
             }

src/Validator/StringValidator.php

Spacing +13 added lines, -13 removed lines

@@ -45,7 +45,7 @@ 
             ]
         ];
 
-        $this->add(function ($value, $nameKey) {
+        $this->add(function($value, $nameKey) {
             if (is_null($value)) {
                 return;
             }
@@ -64,7 +64,7 @@ 
      */
     public function token()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             preg_match('/[a-zA-Z0-9_]+/', $value, $matches);
             if (!(isset($matches[0]) && ($matches[0] == $value))) {
                 $this->createError('string.token', $value, $nameKey);
@@ -81,7 +81,7 @@ 
      */
     public function min($min)
     {
-        return $this->add(function ($value, $nameKey) use ($min) {
+        return $this->add(function($value, $nameKey) use ($min) {
             if (strlen($value) < $min) {
                 $this->createError('string.min', $value, $nameKey, $min);
             }
@@ -96,7 +96,7 @@ 
      */
     public function max($max)
     {
-        return $this->add(function ($value, $nameKey) use ($max) {
+        return $this->add(function($value, $nameKey) use ($max) {
             if (strlen($value) > $max) {
                 return $this->createError('string.max', $value, $nameKey, $max);
             }
@@ -111,7 +111,7 @@ 
      */
     public function matches($regex)
     {
-        return $this->add(function ($value, $nameKey) use ($regex) {
+        return $this->add(function($value, $nameKey) use ($regex) {
             if (!preg_match($regex, $value)) {
                 return $this->createError('string.matches', $value, $nameKey, $regex);
             }
@@ -125,7 +125,7 @@ 
      */
     public function length($length)
     {
-        return $this->add(function ($value, $nameKey) use ($length) {
+        return $this->add(function($value, $nameKey) use ($length) {
             if (strlen($value) != $length) {
                 return $this->createError('string.length', $value, $nameKey, $length);
             }
@@ -139,7 +139,7 @@ 
      */
     public function alphanum()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!ctype_alnum($value)) {
                 return $this->createError('string.alphanum', $value, $nameKey);
             }
@@ -153,7 +153,7 @@ 
      */
     public function alpha()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!ctype_alpha($value)) {
                 return $this->createError('string.alpha', $value, $nameKey);
             }
@@ -167,7 +167,7 @@ 
      */
     public function email()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
                 return $this->createError('string.email', $value, $nameKey);
             }
@@ -181,7 +181,7 @@ 
      */
     public function creditCard()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             $i = strlen($value);
             $sum = 0;
             $mul = 1;
@@ -206,7 +206,7 @@ 
      */
     public function ip()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!filter_var($value, FILTER_VALIDATE_IP)) {
                 return $this->createError('string.ip', $value, $nameKey);
             }
@@ -220,7 +220,7 @@ 
      */
     public function uri()
     {
-        return $this->add(function ($value, $nameKey) {
+        return $this->add(function($value, $nameKey) {
             if (!filter_var($value, FILTER_VALIDATE_URL)) {
                 return $this->createError('string.uri', $value, $nameKey);
             }
@@ -237,7 +237,7 @@ 
      */
     public function replace($pattern, $replacement)
     {
-        return $this->add(function ($value, $nameKey) use ($pattern, $replacement) {
+        return $this->add(function($value, $nameKey) use ($pattern, $replacement) {
             return preg_replace($pattern, $replacement, $value);
         });
     }