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

laravel · Jun 7, 2017 · 6bcc9b1 · 6bcc9b1
2 parents 5885f85 + 12272dd
commit 6bcc9b1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -688,6 +688,7 @@ protected function getElapsedTime($start)
      * @param  array  $bindings
      * @param  \Closure  $callback
      * @return mixed
+     * @throws \Exception
      */
     protected function handleQueryException($e, $query, $bindings, Closure $callback)
     {

diff --git a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
@@ -57,6 +57,7 @@ public function bootstrap(Application $app)
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @param  \Illuminate\Contracts\Config\Repository  $repository
      * @return void
+     * @throws \Exception
      */
     protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
     {

diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -34,7 +34,7 @@ class Markdown
     /**
      * Create a new Markdown renderer instance.
      *
-     * @param  \Illuminate\View\Factory  $view
+     * @param  \Illuminate\Contracts\View\Factory  $view
      * @param  array  $options
      * @return void
      */

diff --git a/src/Illuminate/View/Engines/CompilerEngine.php b/src/Illuminate/View/Engines/CompilerEngine.php
@@ -70,7 +70,7 @@ public function get($path, array $data = [])
      * @param  int  $obLevel
      * @return void
      *
-     * @throws $e
+     * @throws \Exception
      */
     protected function handleViewException(Exception $e, $obLevel)
     {

diff --git a/src/Illuminate/View/Engines/PhpEngine.php b/src/Illuminate/View/Engines/PhpEngine.php
@@ -56,7 +56,7 @@ protected function evaluatePath($__path, $__data)
      * @param  int  $obLevel
      * @return void
      *
-     * @throws $e
+     * @throws \Exception
      */
     protected function handleViewException(Exception $e, $obLevel)
     {