From 6425afa14bd85ca170265001ec1ab398b48891eb Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Tue, 7 Mar 2017 22:17:58 +0100
Subject: [PATCH 1/3] Fixes phpdocs

---
 src/Illuminate/Support/ServiceProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Support/ServiceProvider.php b/src/Illuminate/Support/ServiceProvider.php
index dede6bb6ee91..67a3284d948e 100755
--- a/src/Illuminate/Support/ServiceProvider.php
+++ b/src/Illuminate/Support/ServiceProvider.php
@@ -9,7 +9,7 @@ abstract class ServiceProvider
     /**
      * The application instance.
      *
-     * @var \Illuminate\Contracts\Foundation\Application
+     * @var \Illuminate\Foundation\Application
      */
     protected $app;
 
@@ -37,7 +37,7 @@ abstract class ServiceProvider
     /**
      * Create a new service provider instance.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @param  \Illuminate\Foundation\Application  $app
      * @return void
      */
     public function __construct($app)

From bb0442fb42c00f97bcf36c7b38e5d65f6c934f26 Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Thu, 9 Mar 2017 22:17:44 +0100
Subject: [PATCH 2/3] Removes usage of Foundation package helper

---
 src/Illuminate/Mail/MailServiceProvider.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Mail/MailServiceProvider.php b/src/Illuminate/Mail/MailServiceProvider.php
index ddb59da4b79e..6ab0e20978d5 100755
--- a/src/Illuminate/Mail/MailServiceProvider.php
+++ b/src/Illuminate/Mail/MailServiceProvider.php
@@ -122,9 +122,11 @@ protected function registerMarkdownRenderer()
         }
 
         $this->app->singleton(Markdown::class, function () {
+            $config = $this->app->make('config');
+
             return new Markdown($this->app->make('view'), [
-                'theme' => config('mail.markdown.theme', 'default'),
-                'paths' => config('mail.markdown.paths', []),
+                'theme' => $config->get('mail.markdown.theme', 'default'),
+                'paths' => $config->get('mail.markdown.paths', []),
             ]);
         });
     }

From b12092a5724ad531123fd54fae8a44957946462b Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Thu, 9 Mar 2017 22:24:18 +0100
Subject: [PATCH 3/3] Updates way of access to app instance

---
 src/Illuminate/Mail/MailServiceProvider.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Illuminate/Mail/MailServiceProvider.php b/src/Illuminate/Mail/MailServiceProvider.php
index 6ab0e20978d5..494fcad57164 100755
--- a/src/Illuminate/Mail/MailServiceProvider.php
+++ b/src/Illuminate/Mail/MailServiceProvider.php
@@ -121,10 +121,10 @@ protected function registerMarkdownRenderer()
             ], 'laravel-mail');
         }
 
-        $this->app->singleton(Markdown::class, function () {
-            $config = $this->app->make('config');
+        $this->app->singleton(Markdown::class, function ($app) {
+            $config = $app->make('config');
 
-            return new Markdown($this->app->make('view'), [
+            return new Markdown($app->make('view'), [
                 'theme' => $config->get('mail.markdown.theme', 'default'),
                 'paths' => $config->get('mail.markdown.paths', []),
             ]);