Merge remote-tracking branch 'origin/5.3' into 5.3

laravel · Oct 13, 2016 · 30abf1c · 30abf1c
2 parents 9a755c9 + e53ebfb
commit 30abf1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -757,7 +757,7 @@ public function when($value, $callback, $default = null)
     /**
      * Add a basic where clause to the query.
      *
-     * @param  string  $column
+     * @param  string|\Closure  $column
      * @param  string  $operator
      * @param  mixed   $value
      * @param  string  $boolean
@@ -781,7 +781,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
     /**
      * Add an "or where" clause to the query.
      *
-     * @param  string  $column
+     * @param  string|\Closure  $column
      * @param  string  $operator
      * @param  mixed   $value
      * @return \Illuminate\Database\Eloquent\Builder|static

diff --git a/src/Illuminate/Notifications/Messages/SlackMessage.php b/src/Illuminate/Notifications/Messages/SlackMessage.php
@@ -154,7 +154,7 @@ public function color()
     }
 
     /**
-     * Set additional request options for teh Guzzle HTTP client.
+     * Set additional request options for the Guzzle HTTP client.
      *
      * @param  array  $options
      * @return $this