From 9e98e7a5120f14e942bd00a1439e1a049440eea8 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Tue, 27 Dec 2016 11:40:59 -0600
Subject: [PATCH] move concerns

---
 src/Illuminate/Validation/FormatsMessages.php |  367 -----
 .../Validation/ReplacesAttributes.php         |  330 ----
 .../Validation/ValidatesAttributes.php        | 1410 -----------------
 src/Illuminate/Validation/Validator.php       |    3 +-
 4 files changed, 2 insertions(+), 2108 deletions(-)
 delete mode 100644 src/Illuminate/Validation/FormatsMessages.php
 delete mode 100644 src/Illuminate/Validation/ReplacesAttributes.php
 delete mode 100644 src/Illuminate/Validation/ValidatesAttributes.php

diff --git a/src/Illuminate/Validation/FormatsMessages.php b/src/Illuminate/Validation/FormatsMessages.php
deleted file mode 100644
index 595762514f96..000000000000
--- a/src/Illuminate/Validation/FormatsMessages.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-namespace Illuminate\Validation;
-
-use Closure;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use Illuminate\Contracts\Container\Container;
-use Symfony\Component\HttpFoundation\File\File;
-use Illuminate\Contracts\Translation\Translator;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-trait FormatsMessages
-{
-    use ReplacesAttributes;
-
-    /**
-     * The size related validation rules.
-     *
-     * @var array
-     */
-    protected $sizeRules = ['Size', 'Between', 'Min', 'Max'];
-
-    /**
-     * The numeric related validation rules.
-     *
-     * @var array
-     */
-    protected $numericRules = ['Numeric', 'Integer'];
-
-    /**
-     * Get the validation message for an attribute and rule.
-     *
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @return string
-     */
-    protected function getMessage($attribute, $rule)
-    {
-        $inlineMessage = $this->getFromLocalArray(
-            $attribute, $lowerRule = Str::snake($rule)
-        );
-
-        // First we will retrieve the custom message for the validation rule if one
-        // exists. If a custom validation message is being used we'll return the
-        // custom message, otherwise we'll keep searching for a valid message.
-        if (! is_null($inlineMessage)) {
-            return $inlineMessage;
-        }
-
-        $customMessage = $this->getCustomMessageFromTranslator(
-            $customKey = "validation.custom.{$attribute}.{$lowerRule}"
-        );
-
-        // First we check for a custom defined validation message for the attribute
-        // and rule. This allows the developer to specify specific messages for
-        // only some attributes and rules that need to get specially formed.
-        if ($customMessage !== $customKey) {
-            return $customMessage;
-        }
-
-        // If the rule being validated is a "size" rule, we will need to gather the
-        // specific error message for the type of attribute being validated such
-        // as a number, file or string which all have different message types.
-        elseif (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule);
-        }
-
-        // Finally, if no developer specified messages have been set, and no other
-        // special messages apply for this rule, we will just pull the default
-        // messages out of the translator service for this validation rule.
-        $key = "validation.{$lowerRule}";
-
-        if ($key != ($value = $this->translator->trans($key))) {
-            return $value;
-        }
-
-        return $this->getFromLocalArray(
-            $attribute, $lowerRule, $this->fallbackMessages
-        ) ?: $key;
-    }
-
-    /**
-     * Get the inline message for a rule if it exists.
-     *
-     * @param  string  $attribute
-     * @param  string  $lowerRule
-     * @param  array   $source
-     * @return string|null
-     */
-    protected function getFromLocalArray($attribute, $lowerRule, $source = null)
-    {
-        $source = $source ?: $this->customMessages;
-
-        $keys = ["{$attribute}.{$lowerRule}", $lowerRule];
-
-        // First we will check for a custom message for an attribute specific rule
-        // message for the fields, then we will check for a general custom line
-        // that is not attribute specific. If we find either we'll return it.
-        foreach ($keys as $key) {
-            foreach (array_keys($source) as $sourceKey) {
-                if (Str::is($sourceKey, $key)) {
-                    return $source[$sourceKey];
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the custom error message from translator.
-     *
-     * @param  string  $key
-     * @return string
-     */
-    protected function getCustomMessageFromTranslator($key)
-    {
-        if (($message = $this->translator->trans($key)) !== $key) {
-            return $message;
-        }
-
-        // If an exact match was not found for the key, we will collapse all of these
-        // messages and loop through them and try to find a wildcard match for the
-        // given key. Otherwise, we will simply return the key's value back out.
-        $shortKey = preg_replace(
-            '/^validation\.custom\./', '', $key
-        );
-
-        return $this->getWildcardCustomMessages(Arr::dot(
-            (array) $this->translator->trans('validation.custom')
-        ), $shortKey, $key);
-    }
-
-    /**
-     * Check the given messages for a wildcard key.
-     *
-     * @param  array  $messages
-     * @param  string  $search
-     * @param  string  $default
-     * @return string
-     */
-    protected function getWildcardCustomMessages($messages, $search, $default)
-    {
-        foreach ($messages as $key => $message) {
-            if ($search === $key || (Str::contains($key, ['*']) && Str::is($key, $search))) {
-                return $message;
-            }
-        }
-
-        return $default;
-    }
-
-    /**
-     * Get the proper error message for an attribute and size rule.
-     *
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @return string
-     */
-    protected function getSizeMessage($attribute, $rule)
-    {
-        $lowerRule = Str::snake($rule);
-
-        // There are three different types of size validations. The attribute may be
-        // either a number, file, or string so we will check a few things to know
-        // which type of value it is and return the correct line for that type.
-        $type = $this->getAttributeType($attribute);
-
-        $key = "validation.{$lowerRule}.{$type}";
-
-        return $this->translator->trans($key);
-    }
-
-    /**
-     * Get the data type of the given attribute.
-     *
-     * @param  string  $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        // We assume that the attributes present in the file array are files so that
-        // means that if the attribute does not have a numeric rule and the files
-        // list doesn't have it we'll just consider it a string by elimination.
-        if ($this->hasRule($attribute, $this->numericRules)) {
-            return 'numeric';
-        } elseif ($this->hasRule($attribute, ['Array'])) {
-            return 'array';
-        } elseif ($this->getValue($attribute) instanceof UploadedFile) {
-            return 'file';
-        }
-
-        return 'string';
-    }
-
-    /**
-     * Replace all error message place-holders with actual values.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    public function makeReplacements($message, $attribute, $rule, $parameters)
-    {
-        $message = $this->replaceAttributePlaceholder(
-            $message, $this->getDisplayableAttribute($attribute)
-        );
-
-        if (isset($this->replacers[Str::snake($rule)])) {
-            return $this->callReplacer($message, $attribute, Str::snake($rule), $parameters);
-        } elseif (method_exists($this, $replacer = "replace{$rule}")) {
-            return $this->$replacer($message, $attribute, $rule, $parameters);
-        }
-
-        return $message;
-    }
-
-    /**
-     * Get the displayable name of the attribute.
-     *
-     * @param  string  $attribute
-     * @return string
-     */
-    protected function getDisplayableAttribute($attribute)
-    {
-        $primaryAttribute = $this->getPrimaryAttribute($attribute);
-
-        $expectedAttributes = $attribute != $primaryAttribute
-                    ? [$attribute, $primaryAttribute] : [$attribute];
-
-        foreach ($expectedAttributes as $name) {
-            // The developer may dynamically specify the array of custom attributes on this
-            // validator instance. If the attribute exists in this array it is used over
-            // the other ways of pulling the attribute name for this given attributes.
-            if (isset($this->customAttributes[$name])) {
-                return $this->customAttributes[$name];
-            }
-
-            // We allow for a developer to specify language lines for any attribute in this
-            // application, which allows flexibility for displaying a unique displayable
-            // version of the attribute name instead of the name used in an HTTP POST.
-            if ($line = $this->getAttributeFromTranslations($name)) {
-                return $line;
-            }
-        }
-
-        // When no language line has been specified for the attribute and it is also
-        // an implicit attribute we will display the raw attribute's name and not
-        // modify it with any of these replacements before we display the name.
-        if (isset($this->implicitAttributes[$primaryAttribute])) {
-            return $attribute;
-        }
-
-        return str_replace('_', ' ', Str::snake($attribute));
-    }
-
-    /**
-     * Get the given attribute from the attribute translations.
-     *
-     * @param  string  $name
-     * @return string
-     */
-    protected function getAttributeFromTranslations($name)
-    {
-        return Arr::get($this->translator->trans('validation.attributes'), $name);
-    }
-
-    /**
-     * Replace the :attribute placeholder in the given message.
-     *
-     * @param  string  $message
-     * @param  string  $value
-     * @return string
-     */
-    protected function replaceAttributePlaceholder($message, $value)
-    {
-        return str_replace(
-            [':attribute', ':ATTRIBUTE', ':Attribute'],
-            [$value, Str::upper($value), Str::ucfirst($value)],
-            $message
-        );
-    }
-
-    /**
-     * Get the displayable name of the value.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return string
-     */
-    public function getDisplayableValue($attribute, $value)
-    {
-        if (isset($this->customValues[$attribute][$value])) {
-            return $this->customValues[$attribute][$value];
-        }
-
-        $key = "validation.values.{$attribute}.{$value}";
-
-        if (($line = $this->translator->trans($key)) !== $key) {
-            return $line;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Transform an array of attributes to their displayable form.
-     *
-     * @param  array  $values
-     * @return array
-     */
-    protected function getAttributeList(array $values)
-    {
-        $attributes = [];
-
-        // For each attribute in the list we will simply get its displayable form as
-        // this is convenient when replacing lists of parameters like some of the
-        // replacement functions do when formatting out the validation message.
-        foreach ($values as $key => $value) {
-            $attributes[$key] = $this->getDisplayableAttribute($value);
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * Call a custom validator message replacer.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string|null
-     */
-    protected function callReplacer($message, $attribute, $rule, $parameters)
-    {
-        $callback = $this->replacers[$rule];
-
-        if ($callback instanceof Closure) {
-            return call_user_func_array($callback, func_get_args());
-        } elseif (is_string($callback)) {
-            return $this->callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters);
-        }
-    }
-
-    /**
-     * Call a class based validator message replacer.
-     *
-     * @param  string  $callback
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters)
-    {
-        if (Str::contains($callback, '@')) {
-            list($class, $method) = explode('@', $callback);
-        } else {
-            list($class, $method) = [$callback, 'replace'];
-        }
-
-        return call_user_func_array([$this->container->make($class), $method], array_slice(func_get_args(), 1));
-    }
-}
diff --git a/src/Illuminate/Validation/ReplacesAttributes.php b/src/Illuminate/Validation/ReplacesAttributes.php
deleted file mode 100644
index 8ff65e04256d..000000000000
--- a/src/Illuminate/Validation/ReplacesAttributes.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-
-namespace Illuminate\Validation;
-
-use Illuminate\Support\Arr;
-
-trait ReplacesAttributes
-{
-    /**
-     * Replace all place-holders for the between rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceBetween($message, $attribute, $rule, $parameters)
-    {
-        return str_replace([':min', ':max'], $parameters, $message);
-    }
-
-    /**
-     * Replace all place-holders for the date_format rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceDateFormat($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':format', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the different rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceDifferent($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceSame($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the digits rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceDigits($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':digits', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the digits (between) rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceDigitsBetween($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceBetween($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the min rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceMin($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':min', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the max rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceMax($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':max', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the in rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceIn($message, $attribute, $rule, $parameters)
-    {
-        foreach ($parameters as &$parameter) {
-            $parameter = $this->getDisplayableValue($attribute, $parameter);
-        }
-
-        return str_replace(':values', implode(', ', $parameters), $message);
-    }
-
-    /**
-     * Replace all place-holders for the not_in rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceNotIn($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceIn($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the in_array rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceInArray($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':other', $this->getDisplayableAttribute($parameters[0]), $message);
-    }
-
-    /**
-     * Replace all place-holders for the mimetypes rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceMimetypes($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':values', implode(', ', $parameters), $message);
-    }
-
-    /**
-     * Replace all place-holders for the mimes rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceMimes($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':values', implode(', ', $parameters), $message);
-    }
-
-    /**
-     * Replace all place-holders for the required_with rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredWith($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':values', implode(' / ', $this->getAttributeList($parameters)), $message);
-    }
-
-    /**
-     * Replace all place-holders for the required_with_all rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredWithAll($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the required_without rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredWithout($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the required_without_all rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredWithoutAll($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
-    }
-
-    /**
-     * Replace all place-holders for the size rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceSize($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':size', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the required_if rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredIf($message, $attribute, $rule, $parameters)
-    {
-        $parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
-
-        $parameters[0] = $this->getDisplayableAttribute($parameters[0]);
-
-        return str_replace([':other', ':value'], $parameters, $message);
-    }
-
-    /**
-     * Replace all place-holders for the required_unless rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceRequiredUnless($message, $attribute, $rule, $parameters)
-    {
-        $other = $this->getDisplayableAttribute(array_shift($parameters));
-
-        return str_replace([':other', ':values'], [$other, implode(', ', $parameters)], $message);
-    }
-
-    /**
-     * Replace all place-holders for the same rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceSame($message, $attribute, $rule, $parameters)
-    {
-        return str_replace(':other', $this->getDisplayableAttribute($parameters[0]), $message);
-    }
-
-    /**
-     * Replace all place-holders for the before rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceBefore($message, $attribute, $rule, $parameters)
-    {
-        if (! (strtotime($parameters[0]))) {
-            return str_replace(':date', $this->getDisplayableAttribute($parameters[0]), $message);
-        }
-
-        return str_replace(':date', $parameters[0], $message);
-    }
-
-    /**
-     * Replace all place-holders for the after rule.
-     *
-     * @param  string  $message
-     * @param  string  $attribute
-     * @param  string  $rule
-     * @param  array   $parameters
-     * @return string
-     */
-    protected function replaceAfter($message, $attribute, $rule, $parameters)
-    {
-        return $this->replaceBefore($message, $attribute, $rule, $parameters);
-    }
-}
diff --git a/src/Illuminate/Validation/ValidatesAttributes.php b/src/Illuminate/Validation/ValidatesAttributes.php
deleted file mode 100644
index 7d28633063de..000000000000
--- a/src/Illuminate/Validation/ValidatesAttributes.php
+++ /dev/null
@@ -1,1410 +0,0 @@
-<?php
-
-namespace Illuminate\Validation;
-
-use DateTime;
-use Countable;
-use Exception;
-use Throwable;
-use DateTimeZone;
-use DateTimeInterface;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use InvalidArgumentException;
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-trait ValidatesAttributes
-{
-    /**
-     * Validate that an attribute was "accepted".
-     *
-     * This validation rule implies the attribute is "required".
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateAccepted($attribute, $value)
-    {
-        $acceptable = ['yes', 'on', '1', 1, true, 'true'];
-
-        return $this->validateRequired($attribute, $value) && in_array($value, $acceptable, true);
-    }
-
-    /**
-     * Validate that an attribute is an active URL.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateActiveUrl($attribute, $value)
-    {
-        if (! is_string($value)) {
-            return false;
-        }
-
-        if ($url = parse_url($value, PHP_URL_HOST)) {
-            try {
-                return count(dns_get_record($url, DNS_A | DNS_AAAA)) > 0;
-            } catch (Exception $e) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * "Break" on first validation fail.
-     *
-     * Always returns true, just lets us put "bail" in rules.
-     *
-     * @return bool
-     */
-    protected function validateBail()
-    {
-        return true;
-    }
-
-    /**
-     * Validate the date is before a given date.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateBefore($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'before');
-
-        return $this->compareDates($attribute, $value, $parameters, '<');
-    }
-
-    /**
-     * Validate the date is before or equal a given date.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateBeforeOrEqual($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'before_or_equal');
-
-        return $this->compareDates($attribute, $value, $parameters, '<=');
-    }
-
-    /**
-     * Validate the date is after a given date.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateAfter($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'after');
-
-        return $this->compareDates($attribute, $value, $parameters, '>');
-    }
-
-    /**
-     * Validate the date is equal or after a given date.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateAfterOrEqual($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'after_or_equal');
-
-        return $this->compareDates($attribute, $value, $parameters, '>=');
-    }
-
-    /**
-     * Compare a given date against another using an operator.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  array  $parameters
-     * @param  string  $operator
-     * @return bool
-     */
-    protected function compareDates($attribute, $value, $parameters, $operator)
-    {
-        if (! is_string($value) && ! is_numeric($value) && ! $value instanceof DateTimeInterface) {
-            return false;
-        }
-
-        if ($format = $this->getDateFormat($attribute)) {
-            return $this->checkDateTimeOrder(
-                $format, $value, $this->getValue($parameters[0]) ?: $parameters[0], $operator
-            );
-        }
-
-        if (! $date = $this->getDateTimestamp($parameters[0])) {
-            $date = $this->getDateTimestamp($this->getValue($parameters[0]));
-        }
-
-        return $this->compare($this->getDateTimestamp($value), $date, $operator);
-    }
-
-    /**
-     * Get the date format for an attribute if it has one.
-     *
-     * @param  string  $attribute
-     * @return string|null
-     */
-    protected function getDateFormat($attribute)
-    {
-        if ($result = $this->getRule($attribute, 'DateFormat')) {
-            return $result[1][0];
-        }
-    }
-
-    /**
-     * Get the date timestamp.
-     *
-     * @param  mixed  $value
-     * @return int
-     */
-    protected function getDateTimestamp($value)
-    {
-        return $value instanceof DateTimeInterface ? $value->getTimestamp() : strtotime($value);
-    }
-
-    /**
-     * Given two date/time strings, check that one is after the other.
-     *
-     * @param  string  $format
-     * @param  string  $first
-     * @param  string  $second
-     * @param  string  $operator
-     * @return bool
-     */
-    protected function checkDateTimeOrder($format, $first, $second, $operator)
-    {
-        $first = $this->getDateTimeWithOptionalFormat($format, $first);
-
-        $second = $this->getDateTimeWithOptionalFormat($format, $second);
-
-        return ($first && $second) && ($this->compare($first, $second, $operator));
-    }
-
-    /**
-     * Get a DateTime instance from a string.
-     *
-     * @param  string  $format
-     * @param  string  $value
-     * @return \DateTime|null
-     */
-    protected function getDateTimeWithOptionalFormat($format, $value)
-    {
-        if ($date = DateTime::createFromFormat($format, $value)) {
-            return $date;
-        }
-
-        try {
-            return new DateTime($value);
-        } catch (Exception $e) {
-            //
-        }
-    }
-
-    /**
-     * Validate that an attribute contains only alphabetic characters.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateAlpha($attribute, $value)
-    {
-        return is_string($value) && preg_match('/^[\pL\pM]+$/u', $value);
-    }
-
-    /**
-     * Validate that an attribute contains only alpha-numeric characters, dashes, and underscores.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateAlphaDash($attribute, $value)
-    {
-        if (! is_string($value) && ! is_numeric($value)) {
-            return false;
-        }
-
-        return preg_match('/^[\pL\pM\pN_-]+$/u', $value) > 0;
-    }
-
-    /**
-     * Validate that an attribute contains only alpha-numeric characters.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateAlphaNum($attribute, $value)
-    {
-        if (! is_string($value) && ! is_numeric($value)) {
-            return false;
-        }
-
-        return preg_match('/^[\pL\pM\pN]+$/u', $value) > 0;
-    }
-
-    /**
-     * Validate that an attribute is an array.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateArray($attribute, $value)
-    {
-        return is_array($value);
-    }
-
-    /**
-     * Validate the size of an attribute is between a set of values.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateBetween($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'between');
-
-        $size = $this->getSize($attribute, $value);
-
-        return $size >= $parameters[0] && $size <= $parameters[1];
-    }
-
-    /**
-     * Validate that an attribute is a boolean.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateBoolean($attribute, $value)
-    {
-        $acceptable = [true, false, 0, 1, '0', '1'];
-
-        return in_array($value, $acceptable, true);
-    }
-
-    /**
-     * Validate that an attribute has a matching confirmation.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateConfirmed($attribute, $value)
-    {
-        return $this->validateSame($attribute, $value, [$attribute.'_confirmation']);
-    }
-
-    /**
-     * Validate that an attribute is a valid date.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateDate($attribute, $value)
-    {
-        if ($value instanceof DateTime) {
-            return true;
-        }
-
-        if ((! is_string($value) && ! is_numeric($value)) || strtotime($value) === false) {
-            return false;
-        }
-
-        $date = date_parse($value);
-
-        return checkdate($date['month'], $date['day'], $date['year']);
-    }
-
-    /**
-     * Validate that an attribute matches a date format.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateDateFormat($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'date_format');
-
-        if (! is_string($value) && ! is_numeric($value)) {
-            return false;
-        }
-
-        $date = DateTime::createFromFormat($parameters[0], $value);
-
-        return $date && $date->format($parameters[0]) == $value;
-    }
-
-    /**
-     * Validate that an attribute is different from another attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateDifferent($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'different');
-
-        $other = Arr::get($this->data, $parameters[0]);
-
-        return isset($other) && $value !== $other;
-    }
-
-    /**
-     * Validate that an attribute has a given number of digits.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateDigits($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'digits');
-
-        return ! preg_match('/[^0-9]/', $value)
-                    && strlen((string) $value) == $parameters[0];
-    }
-
-    /**
-     * Validate that an attribute is between a given number of digits.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateDigitsBetween($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'digits_between');
-
-        $length = strlen((string) $value);
-
-        return ! preg_match('/[^0-9]/', $value)
-                    && $length >= $parameters[0] && $length <= $parameters[1];
-    }
-
-    /**
-     * Validate the dimensions of an image matches the given values.
-     *
-     * @param  string $attribute
-     * @param  mixed $value
-     * @param  array $parameters
-     * @return bool
-     */
-    protected function validateDimensions($attribute, $value, $parameters)
-    {
-        if (! $this->isValidFileInstance($value) || ! $sizeDetails = getimagesize($value->getRealPath())) {
-            return false;
-        }
-
-        $this->requireParameterCount(1, $parameters, 'dimensions');
-
-        list($width, $height) = $sizeDetails;
-
-        $parameters = $this->parseNamedParameters($parameters);
-
-        if ($this->failsBasicDimensionChecks($parameters, $width, $height) ||
-            $this->failsRatioCheck($parameters, $width, $height)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Test if the given width and height fail any conditions.
-     *
-     * @param  array  $parameters
-     * @param  int  $width
-     * @param  int  $height
-     * @return bool
-     */
-    protected function failsBasicDimensionChecks($parameters, $width, $height)
-    {
-        return (isset($parameters['width']) && $parameters['width'] != $width) ||
-               (isset($parameters['min_width']) && $parameters['min_width'] > $width) ||
-               (isset($parameters['max_width']) && $parameters['max_width'] < $width) ||
-               (isset($parameters['height']) && $parameters['height'] != $height) ||
-               (isset($parameters['min_height']) && $parameters['min_height'] > $height) ||
-               (isset($parameters['max_height']) && $parameters['max_height'] < $height);
-    }
-
-    /**
-     * Determine if the given parameters fail a dimension ratio check.
-     *
-     * @param  array  $parameters
-     * @param  int  $width
-     * @param  int  $height
-     * @return bool
-     */
-    protected function failsRatioCheck($parameters, $width, $height)
-    {
-        if (! isset($parameters['ratio'])) {
-            return false;
-        }
-
-        list($numerator, $denominator) = array_replace(
-            [1, 1], array_filter(sscanf($parameters['ratio'], '%f/%d'))
-        );
-
-        return $numerator / $denominator !== $width / $height;
-    }
-
-    /**
-     * Validate an attribute is unique among other values.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateDistinct($attribute, $value, $parameters)
-    {
-        $attributeName = $this->getPrimaryAttribute($attribute);
-
-        $attributeData = ValidationData::extractDataFromPath(
-            ValidationData::getLeadingExplicitAttributePath($attributeName), $this->data
-        );
-
-        $data = Arr::where(Arr::dot($attributeData), function ($value, $key) use ($attribute, $attributeName) {
-            return $key != $attribute && Str::is($attributeName, $key);
-        });
-
-        return ! in_array($value, array_values($data));
-    }
-
-    /**
-     * Validate that an attribute is a valid e-mail address.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateEmail($attribute, $value)
-    {
-        return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
-    }
-
-    /**
-     * Validate the existence of an attribute value in a database table.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateExists($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'exists');
-
-        list($connection, $table) = $this->parseTable($parameters[0]);
-
-        // The second parameter position holds the name of the column that should be
-        // verified as existing. If this parameter is not specified we will guess
-        // that the columns being "verified" shares the given attribute's name.
-        $column = $this->getQueryColumn($parameters, $attribute);
-
-        $expected = (is_array($value)) ? count($value) : 1;
-
-        return $this->getExistCount(
-            $connection, $table, $column, $value, $parameters
-        ) >= $expected;
-    }
-
-    /**
-     * Get the number of records that exist in storage.
-     *
-     * @param  mixed   $connection
-     * @param  string  $table
-     * @param  string  $column
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return int
-     */
-    protected function getExistCount($connection, $table, $column, $value, $parameters)
-    {
-        $verifier = $this->getPresenceVerifierFor($connection);
-
-        $extra = $this->getExtraConditions(
-            array_values(array_slice($parameters, 2))
-        );
-
-        if ($this->currentRule instanceof Rules\Exists) {
-            $extra = array_merge($extra, $this->currentRule->queryCallbacks());
-        }
-
-        return is_array($value)
-                ? $verifier->getMultiCount($table, $column, $value, $extra)
-                : $verifier->getCount($table, $column, $value, null, null, $extra);
-    }
-
-    /**
-     * Validate the uniqueness of an attribute value on a given database table.
-     *
-     * If a database column is not specified, the attribute will be used.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateUnique($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'unique');
-
-        list($connection, $table) = $this->parseTable($parameters[0]);
-
-        // The second parameter position holds the name of the column that needs to
-        // be verified as unique. If this parameter isn't specified we will just
-        // assume that this column to be verified shares the attribute's name.
-        $column = $this->getQueryColumn($parameters, $attribute);
-
-        list($idColumn, $id) = [null, null];
-
-        if (isset($parameters[2])) {
-            list($idColumn, $id) = $this->getUniqueIds($parameters);
-        }
-
-        // The presence verifier is responsible for counting rows within this store
-        // mechanism which might be a relational database or any other permanent
-        // data store like Redis, etc. We will use it to determine uniqueness.
-        $verifier = $this->getPresenceVerifierFor($connection);
-
-        $extra = $this->getUniqueExtra($parameters);
-
-        if ($this->currentRule instanceof Rules\Unique) {
-            $extra = array_merge($extra, $this->currentRule->queryCallbacks());
-        }
-
-        return $verifier->getCount(
-            $table, $column, $value, $id, $idColumn, $extra
-        ) == 0;
-    }
-
-    /**
-     * Get the excluded ID column and value for the unique rule.
-     *
-     * @param  array  $parameters
-     * @return array
-     */
-    protected function getUniqueIds($parameters)
-    {
-        $idColumn = isset($parameters[3]) ? $parameters[3] : 'id';
-
-        return [$idColumn, $this->prepareUniqueId($parameters[2])];
-    }
-
-    /**
-     * Prepare the given ID for querying.
-     *
-     * @param  mixed  $id
-     * @return int
-     */
-    protected function prepareUniqueId($id)
-    {
-        if (preg_match('/\[(.*)\]/', $id, $matches)) {
-            $id = $this->getValue($matches[1]);
-        }
-
-        if (strtolower($id) == 'null') {
-            $id = null;
-        }
-
-        if (filter_var($id, FILTER_VALIDATE_INT) !== false) {
-            $id = intval($id);
-        }
-
-        return $id;
-    }
-
-    /**
-     * Get the extra conditions for a unique rule.
-     *
-     * @param  array  $parameters
-     * @return array
-     */
-    protected function getUniqueExtra($parameters)
-    {
-        if (isset($parameters[4])) {
-            return $this->getExtraConditions(array_slice($parameters, 4));
-        }
-
-        return [];
-    }
-
-    /**
-     * Parse the connection / table for the unique / exists rules.
-     *
-     * @param  string  $table
-     * @return array
-     */
-    protected function parseTable($table)
-    {
-        return Str::contains($table, '.') ? explode('.', $table, 2) : [null, $table];
-    }
-
-    /**
-     * Get the column name for an exists / unique query.
-     *
-     * @param  array  $parameters
-     * @param  string  $attribute
-     * @return bool
-     */
-    protected function getQueryColumn($parameters, $attribute)
-    {
-        return isset($parameters[1]) && $parameters[1] !== 'NULL'
-                    ? $parameters[1] : $this->guessColumnForQuery($attribute);
-    }
-
-    /**
-     * Guess the database column from the given attribute name.
-     *
-     * @param  string  $attribute
-     * @return string
-     */
-    public function guessColumnForQuery($attribute)
-    {
-        if (in_array($attribute, array_collapse($this->implicitAttributes))
-                && ! is_numeric($last = last(explode('.', $attribute)))) {
-            return $last;
-        }
-
-        return $attribute;
-    }
-
-    /**
-     * Get the extra conditions for a unique / exists rule.
-     *
-     * @param  array  $segments
-     * @return array
-     */
-    protected function getExtraConditions(array $segments)
-    {
-        $extra = [];
-
-        $count = count($segments);
-
-        for ($i = 0; $i < $count; $i += 2) {
-            $extra[$segments[$i]] = $segments[$i + 1];
-        }
-
-        return $extra;
-    }
-
-    /**
-     * Validate the given value is a valid file.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateFile($attribute, $value)
-    {
-        return $this->isValidFileInstance($value);
-    }
-
-    /**
-     * Validate the given attribute is filled if it is present.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateFilled($attribute, $value)
-    {
-        if (Arr::has($this->data, $attribute)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate the MIME type of a file is an image MIME type.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateImage($attribute, $value)
-    {
-        return $this->validateMimes($attribute, $value, ['jpeg', 'png', 'gif', 'bmp', 'svg']);
-    }
-
-    /**
-     * Validate an attribute is contained within a list of values.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateIn($attribute, $value, $parameters)
-    {
-        if (is_array($value) && $this->hasRule($attribute, 'Array')) {
-            foreach ($value as $element) {
-                if (is_array($element)) {
-                    return false;
-                }
-            }
-
-            return count(array_diff($value, $parameters)) == 0;
-        }
-
-        return ! is_array($value) && in_array((string) $value, $parameters);
-    }
-
-    /**
-     * Validate that the values of an attribute is in another attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateInArray($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'in_array');
-
-        $explicitPath = ValidationData::getLeadingExplicitAttributePath($parameters[0]);
-
-        $attributeData = ValidationData::extractDataFromPath($explicitPath, $this->data);
-
-        $otherValues = Arr::where(Arr::dot($attributeData), function ($value, $key) use ($parameters) {
-            return Str::is($parameters[0], $key);
-        });
-
-        return in_array($value, $otherValues);
-    }
-
-    /**
-     * Validate that an attribute is an integer.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateInteger($attribute, $value)
-    {
-        return filter_var($value, FILTER_VALIDATE_INT) !== false;
-    }
-
-    /**
-     * Validate that an attribute is a valid IP.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateIp($attribute, $value)
-    {
-        return filter_var($value, FILTER_VALIDATE_IP) !== false;
-    }
-
-    /**
-     * Validate that an attribute is a valid IPv4.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateIpv4($attribute, $value)
-    {
-        return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
-    }
-
-    /**
-     * Validate that an attribute is a valid IPv6.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateIpv6($attribute, $value)
-    {
-        return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
-    }
-
-    /**
-     * Validate the attribute is a valid JSON string.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateJson($attribute, $value)
-    {
-        if (! is_scalar($value) && ! method_exists($value, '__toString')) {
-            return false;
-        }
-
-        json_decode($value);
-
-        return json_last_error() === JSON_ERROR_NONE;
-    }
-
-    /**
-     * Validate the size of an attribute is less than a maximum value.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateMax($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'max');
-
-        if ($value instanceof UploadedFile && ! $value->isValid()) {
-            return false;
-        }
-
-        return $this->getSize($attribute, $value) <= $parameters[0];
-    }
-
-    /**
-     * Validate the guessed extension of a file upload is in a set of file extensions.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateMimes($attribute, $value, $parameters)
-    {
-        if (! $this->isValidFileInstance($value)) {
-            return false;
-        }
-
-        return $value->getPath() != '' && in_array($value->guessExtension(), $parameters);
-    }
-
-    /**
-     * Validate the MIME type of a file upload attribute is in a set of MIME types.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  array  $parameters
-     * @return bool
-     */
-    protected function validateMimetypes($attribute, $value, $parameters)
-    {
-        if (! $this->isValidFileInstance($value)) {
-            return false;
-        }
-
-        return $value->getPath() != '' && in_array($value->getMimeType(), $parameters);
-    }
-
-    /**
-     * Validate the size of an attribute is greater than a minimum value.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateMin($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'min');
-
-        return $this->getSize($attribute, $value) >= $parameters[0];
-    }
-
-    /**
-     * "Indicate" validation should pass if value is null.
-     *
-     * Always returns true, just lets us put "nullable" in rules.
-     *
-     * @return bool
-     */
-    protected function validateNullable()
-    {
-        return true;
-    }
-
-    /**
-     * Validate an attribute is not contained within a list of values.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateNotIn($attribute, $value, $parameters)
-    {
-        return ! $this->validateIn($attribute, $value, $parameters);
-    }
-
-    /**
-     * Validate that an attribute is numeric.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateNumeric($attribute, $value)
-    {
-        return is_numeric($value);
-    }
-
-    /**
-     * Validate that an attribute exists even if not filled.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validatePresent($attribute, $value)
-    {
-        return Arr::has($this->data, $attribute);
-    }
-
-    /**
-     * Validate that an attribute passes a regular expression check.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateRegex($attribute, $value, $parameters)
-    {
-        if (! is_string($value) && ! is_numeric($value)) {
-            return false;
-        }
-
-        $this->requireParameterCount(1, $parameters, 'regex');
-
-        return preg_match($parameters[0], $value) > 0;
-    }
-
-    /**
-     * Validate that a required attribute exists.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateRequired($attribute, $value)
-    {
-        if (is_null($value)) {
-            return false;
-        } elseif (is_string($value) && trim($value) === '') {
-            return false;
-        } elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
-            return false;
-        } elseif ($value instanceof File) {
-            return (string) $value->getPath() != '';
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute exists when another attribute has a given value.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  mixed   $parameters
-     * @return bool
-     */
-    protected function validateRequiredIf($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'required_if');
-
-        $other = Arr::get($this->data, $parameters[0]);
-
-        $values = array_slice($parameters, 1);
-
-        if (is_bool($other)) {
-            $values = $this->convertValuesToBoolean($values);
-        }
-
-        if (in_array($other, $values)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Convert the given values to boolean if they are string "true" / "false".
-     *
-     * @param  array  $values
-     * @return array
-     */
-    protected function convertValuesToBoolean($values)
-    {
-        return array_map(function ($value) {
-            if ($value === 'true') {
-                return true;
-            } elseif ($value === 'false') {
-                return false;
-            }
-
-            return $value;
-        }, $values);
-    }
-
-    /**
-     * Validate that an attribute exists when another attribute does not have a given value.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  mixed  $parameters
-     * @return bool
-     */
-    protected function validateRequiredUnless($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'required_unless');
-
-        $data = Arr::get($this->data, $parameters[0]);
-
-        $values = array_slice($parameters, 1);
-
-        if (! in_array($data, $values)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute exists when any other attribute exists.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  mixed   $parameters
-     * @return bool
-     */
-    protected function validateRequiredWith($attribute, $value, $parameters)
-    {
-        if (! $this->allFailingRequired($parameters)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute exists when all other attributes exists.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  mixed   $parameters
-     * @return bool
-     */
-    protected function validateRequiredWithAll($attribute, $value, $parameters)
-    {
-        if (! $this->anyFailingRequired($parameters)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute exists when another attribute does not.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  mixed   $parameters
-     * @return bool
-     */
-    protected function validateRequiredWithout($attribute, $value, $parameters)
-    {
-        if ($this->anyFailingRequired($parameters)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute exists when all other attributes do not.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  mixed   $parameters
-     * @return bool
-     */
-    protected function validateRequiredWithoutAll($attribute, $value, $parameters)
-    {
-        if ($this->allFailingRequired($parameters)) {
-            return $this->validateRequired($attribute, $value);
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine if any of the given attributes fail the required test.
-     *
-     * @param  array  $attributes
-     * @return bool
-     */
-    protected function anyFailingRequired(array $attributes)
-    {
-        foreach ($attributes as $key) {
-            if (! $this->validateRequired($key, $this->getValue($key))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine if all of the given attributes fail the required test.
-     *
-     * @param  array  $attributes
-     * @return bool
-     */
-    protected function allFailingRequired(array $attributes)
-    {
-        foreach ($attributes as $key) {
-            if ($this->validateRequired($key, $this->getValue($key))) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that two attributes match.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateSame($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'same');
-
-        $other = Arr::get($this->data, $parameters[0]);
-
-        return isset($other) && $value === $other;
-    }
-
-    /**
-     * Validate the size of an attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @param  array   $parameters
-     * @return bool
-     */
-    protected function validateSize($attribute, $value, $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'size');
-
-        return $this->getSize($attribute, $value) == $parameters[0];
-    }
-
-    /**
-     * "Validate" optional attributes.
-     *
-     * Always returns true, just lets us put sometimes in rules.
-     *
-     * @return bool
-     */
-    protected function validateSometimes()
-    {
-        return true;
-    }
-
-    /**
-     * Validate that an attribute is a string.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateString($attribute, $value)
-    {
-        return is_string($value);
-    }
-
-    /**
-     * Validate that an attribute is a valid timezone.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateTimezone($attribute, $value)
-    {
-        try {
-            new DateTimeZone($value);
-        } catch (Exception $e) {
-            return false;
-        } catch (Throwable $e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an attribute is a valid URL.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return bool
-     */
-    protected function validateUrl($attribute, $value)
-    {
-        /*
-         * This pattern is derived from Symfony\Component\Validator\Constraints\UrlValidator (2.7.4).
-         *
-         * (c) Fabien Potencier <fabien@symfony.com> http://symfony.com
-         */
-        $pattern = '~^
-            ((aaa|aaas|about|acap|acct|acr|adiumxtra|afp|afs|aim|apt|attachment|aw|barion|beshare|bitcoin|blob|bolo|callto|cap|chrome|chrome-extension|cid|coap|coaps|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-playcontainer|dlna-playsingle|dns|dntp|dtn|dvb|ed2k|example|facetime|fax|feed|feedready|file|filesystem|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|ham|hcp|http|https|iax|icap|icon|im|imap|info|iotdisco|ipn|ipp|ipps|irc|irc6|ircs|iris|iris.beep|iris.lwz|iris.xpc|iris.xpcs|itms|jabber|jar|jms|keyparc|lastfm|ldap|ldaps|magnet|mailserver|mailto|maps|market|message|mid|mms|modem|ms-help|ms-settings|ms-settings-airplanemode|ms-settings-bluetooth|ms-settings-camera|ms-settings-cellular|ms-settings-cloudstorage|ms-settings-emailandaccounts|ms-settings-language|ms-settings-location|ms-settings-lock|ms-settings-nfctransactions|ms-settings-notifications|ms-settings-power|ms-settings-privacy|ms-settings-proximity|ms-settings-screenrotation|ms-settings-wifi|ms-settings-workplace|msnim|msrp|msrps|mtqp|mumble|mupdate|mvn|news|nfs|ni|nih|nntp|notes|oid|opaquelocktoken|pack|palm|paparazzi|pkcs11|platform|pop|pres|prospero|proxy|psyc|query|redis|rediss|reload|res|resource|rmi|rsync|rtmfp|rtmp|rtsp|rtsps|rtspu|secondlife|service|session|sftp|sgn|shttp|sieve|sip|sips|skype|smb|sms|smtp|snews|snmp|soap.beep|soap.beeps|soldat|spotify|ssh|steam|stun|stuns|submit|svn|tag|teamspeak|tel|teliaeid|telnet|tftp|things|thismessage|tip|tn3270|turn|turns|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|videotex|view-source|wais|webcal|ws|wss|wtai|wyciwyg|xcon|xcon-userid|xfire|xmlrpc\.beep|xmlrpc.beeps|xmpp|xri|ymsgr|z39\.50|z39\.50r|z39\.50s))://                                 # protocol
-            (([\pL\pN-]+:)?([\pL\pN-]+)@)?          # basic auth
-            (
-                ([\pL\pN\pS-\.])+(\.?([\pL]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
-                    |                                              # or
-                \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                 # an IP address
-                    |                                              # or
-                \[
-                    (?:(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){6})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:::(?:(?:(?:[0-9a-f]{1,4})):){5})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){4})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,1}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){3})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,2}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){2})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,3}(?:(?:[0-9a-f]{1,4})))?::(?:(?:[0-9a-f]{1,4})):)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,4}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,5}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,6}(?:(?:[0-9a-f]{1,4})))?::))))
-                \]  # an IPv6 address
-            )
-            (:[0-9]+)?                              # a port (optional)
-            (/?|/\S+|\?\S*|\#\S*)                   # a /, nothing, a / with something, a query or a fragment
-        $~ixu';
-
-        return preg_match($pattern, $value) > 0;
-    }
-
-    /**
-     * Get the size of an attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed   $value
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-
-        // This method will determine if the attribute is a number, string, or file and
-        // return the proper size accordingly. If it is a number, then number itself
-        // is the size. If it is a file, we take kilobytes, and for a string the
-        // entire length of the string will be considered the attribute size.
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        } elseif ($value instanceof File) {
-            return $value->getSize() / 1024;
-        }
-
-        return mb_strlen($value);
-    }
-
-    /**
-     * Check that the given value is a valid file instance.
-     *
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function isValidFileInstance($value)
-    {
-        if ($value instanceof UploadedFile && ! $value->isValid()) {
-            return false;
-        }
-
-        return $value instanceof File;
-    }
-
-    /**
-     * Determine if a comparison passes between the given values.
-     *
-     * @param  mixed  $first
-     * @param  mixed  $second
-     * @param  string  $operator
-     * @return bool
-     */
-    protected function compare($first, $second, $operator)
-    {
-        switch ($operator) {
-            case '<':
-                return $first < $second;
-            case '>':
-                return $first > $second;
-            case '<=':
-                return $first <= $second;
-            case '>=':
-                return $first >= $second;
-            default:
-                throw new InvalidArgumentException;
-        }
-    }
-
-    /**
-     * Parse named parameters to $key => $value items.
-     *
-     * @param  array  $parameters
-     * @return array
-     */
-    protected function parseNamedParameters($parameters)
-    {
-        return array_reduce($parameters, function ($result, $item) {
-            list($key, $value) = array_pad(explode('=', $item, 2), 2, null);
-
-            $result[$key] = $value;
-
-            return $result;
-        });
-    }
-
-    /**
-     * Require a certain number of parameters to be present.
-     *
-     * @param  int    $count
-     * @param  array  $parameters
-     * @param  string  $rule
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected function requireParameterCount($count, $parameters, $rule)
-    {
-        if (count($parameters) < $count) {
-            throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
-        }
-    }
-}
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
index 346e5e1b3974..11d59cacbbf3 100755
--- a/src/Illuminate/Validation/Validator.php
+++ b/src/Illuminate/Validation/Validator.php
@@ -17,7 +17,8 @@
 
 class Validator implements ValidatorContract
 {
-    use FormatsMessages, ValidatesAttributes;
+    use Concerns\FormatsMessages,
+        Concerns\ValidatesAttributes;
 
     /**
      * The Translator implementation.