Merge branch '6.x' into 7.x

GrahamCampbell · GrahamCampbell · commit d7207f58d9cd · 2020-06-03T16:31:49.000+01:00
diff --git a/src/Illuminate/Database/Concerns/BuildsQueries.php b/src/Illuminate/Database/Concerns/BuildsQueries.php
@@ -166,7 +166,7 @@ public function when($value, $callback, $default = null)
      * Pass the query to a given callback.
      *
      * @param  callable  $callback
-     * @return \Illuminate\Database\Query\Builder
+     * @return $this
      */
     public function tap($callback)
     {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function when($value, $callback, $default = null)`
`166`	`166`	`* Pass the query to a given callback.`
`167`	`167`	`*`
`168`	`168`	`* @param callable $callback`
`169`		`- * @return \Illuminate\Database\Query\Builder`
	`169`	`+ * @return $this`
`170`	`170`	`*/`
`171`	`171`	`public function tap($callback)`
`172`	`172`	`{`