diff --git a/src/Illuminate/Support/Traits/Conditional.php b/src/Illuminate/Support/Traits/Conditionable.php similarity index 97% rename from src/Illuminate/Support/Traits/Conditional.php rename to src/Illuminate/Support/Traits/Conditionable.php index 0b76e65e48c1..d1cd23d9b2a7 100644 --- a/src/Illuminate/Support/Traits/Conditional.php +++ b/src/Illuminate/Support/Traits/Conditionable.php @@ -2,7 +2,7 @@ namespace Illuminate\Support\Traits; -trait Conditional +trait Conditionable { /** * Apply the callback if the given "value" is true. diff --git a/src/Illuminate/Validation/Rules/Dimensions.php b/src/Illuminate/Validation/Rules/Dimensions.php index d390b8c8823b..624cbcb8caf7 100644 --- a/src/Illuminate/Validation/Rules/Dimensions.php +++ b/src/Illuminate/Validation/Rules/Dimensions.php @@ -2,11 +2,11 @@ namespace Illuminate\Validation\Rules; -use Illuminate\Support\Traits\Conditional; +use Illuminate\Support\Traits\Conditionable; class Dimensions { - use Conditional; + use Conditionable; /** * The constraints for the dimensions rule. diff --git a/src/Illuminate/Validation/Rules/Exists.php b/src/Illuminate/Validation/Rules/Exists.php index 59df5f3da0ee..e6dac83dc83e 100644 --- a/src/Illuminate/Validation/Rules/Exists.php +++ b/src/Illuminate/Validation/Rules/Exists.php @@ -2,12 +2,11 @@ namespace Illuminate\Validation\Rules; -use Illuminate\Support\Traits\Conditional; +use Illuminate\Support\Traits\Conditionable; class Exists { - use DatabaseRule; - use Conditional; + use Conditionable, DatabaseRule; /** * Convert the rule to a validation string. diff --git a/src/Illuminate/Validation/Rules/Password.php b/src/Illuminate/Validation/Rules/Password.php index a6d4e6b8c18e..33ce90ab136c 100644 --- a/src/Illuminate/Validation/Rules/Password.php +++ b/src/Illuminate/Validation/Rules/Password.php @@ -8,12 +8,12 @@ use Illuminate\Contracts\Validation\UncompromisedVerifier; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Traits\Conditional; +use Illuminate\Support\Traits\Conditionable; use InvalidArgumentException; class Password implements Rule, DataAwareRule { - use Conditional; + use Conditionable; /** * The data under validation. diff --git a/src/Illuminate/Validation/Rules/Unique.php b/src/Illuminate/Validation/Rules/Unique.php index 426c313142f6..1f4e86787050 100644 --- a/src/Illuminate/Validation/Rules/Unique.php +++ b/src/Illuminate/Validation/Rules/Unique.php @@ -3,12 +3,11 @@ namespace Illuminate\Validation\Rules; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Traits\Conditional; +use Illuminate\Support\Traits\Conditionable; class Unique { - use DatabaseRule; - use Conditional; + use Conditionable, DatabaseRule; /** * The ID that should be ignored.