Merge branch '5.6' of github.com:laravel/framework into 5.6

taylorotwell · taylorotwell · commit 942f11d76e81 · 2018-06-30T15:17:20.000-05:00
diff --git a/src/Illuminate/Support/Manager.php b/src/Illuminate/Support/Manager.php
@@ -51,6 +51,8 @@ abstract public function getDefaultDriver();
      *
      * @param  string  $driver
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
     public function driver($driver = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ abstract public function getDefaultDriver();`
`51`	`51`	`*`
`52`	`52`	`* @param string $driver`
`53`	`53`	`* @return mixed`
	`54`	`+ *`
	`55`	`+ * @throws \InvalidArgumentException`
`54`	`56`	`*/`
`55`	`57`	`public function driver($driver = null)`
`56`	`58`	`{`