formatting

Author: taylorotwell

src/Illuminate/Validation/Rule.php

@@ -63,25 +63,25 @@ public static function notIn($values)
     }
 
     /**
-     * Get a unique constraint builder instance.
+     * Get a required_if constraint builder instance.
      *
-     * @param  string  $table
-     * @param  string  $column
-     * @return \Illuminate\Validation\Rules\Unique
+     * @param  callable  $callback
+     * @return \Illuminate\Validation\Rules\RequiredIf
      */
-    public static function unique($table, $column = 'NULL')
+    public static function requiredIf($callback)
     {
-        return new Rules\Unique($table, $column);
+        return new Rules\RequiredIf($callback);
     }
 
     /**
-     * Get a required_if constraint builder instance.
+     * Get a unique constraint builder instance.
      *
-     * @param  \Closure  $callback
-     * @return \Illuminate\Validation\Rules\RequiredIf
+     * @param  string  $table
+     * @param  string  $column
+     * @return \Illuminate\Validation\Rules\Unique
      */
-    public static function requiredIf($callback)
+    public static function unique($table, $column = 'NULL')
     {
-        return new Rules\RequiredIf($callback);
+        return new Rules\Unique($table, $column);
     }
 }

src/Illuminate/Validation/Rules/RequiredIf.php

@@ -6,22 +6,17 @@
 
 class RequiredIf
 {
-    /**
-     * The name of the rule.
-     */
-    protected $rule = 'required';
-
     /**
      * The condition that validates the attribute.
      *
-     * @var bool|\Closure
+     * @var callable|bool
      */
     public $condition;
 
     /**
      * Create a new required validation rule based on a condition.
      *
-     * @param  bool|\Closure  $condition
+     * @param  callable|bool  $condition
      * @return void
      */
     public function __construct($condition)
@@ -36,10 +31,10 @@ public function __construct($condition)
      */
     public function __toString()
     {
-        if ($this->condition instanceof Closure) {
-            return $this->condition->__invoke() ? $this->rule : '';
+        if (is_callable($this->condition)) {
+            return call_user_func($this->condition) ? 'required' : '';
         }
 
-        return $this->condition ? $this->rule : '';
+        return $this->condition ? 'required' : '';
     }
 }