rename trait

src/Illuminate/Support/Traits/Conditional.php → 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.

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.

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.

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.

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.