Allow HtmlString as line in notifications MailMessage

laravel · Dec 19, 2017 · f885e78 · f885e78
1 parent 298e6f2
commit f885e78
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Illuminate/Notifications/Messages/SimpleMessage.php b/src/Illuminate/Notifications/Messages/SimpleMessage.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Notifications\Messages;
 
+use Illuminate\Support\HtmlString;
 use Illuminate\Notifications\Action;
 
 class SimpleMessage
@@ -141,7 +142,7 @@ public function salutation($salutation)
     /**
      * Add a line of text to the notification.
      *
-     * @param  \Illuminate\Notifications\Action|string  $line
+     * @param  \Illuminate\Notifications\Action|\Illuminate\Support\HtmlString|string  $line
      * @return $this
      */
     public function line($line)
@@ -152,7 +153,7 @@ public function line($line)
     /**
      * Add a line of text to the notification.
      *
-     * @param  \Illuminate\Notifications\Action|string|array  $line
+     * @param  \Illuminate\Notifications\Action|\Illuminate\Support\HtmlString|string|array  $line
      * @return $this
      */
     public function with($line)
@@ -171,11 +172,15 @@ public function with($line)
     /**
      * Format the given line of text.
      *
-     * @param  string|array  $line
-     * @return string
+     * @param  \Illuminate\Support\HtmlString|string|array  $line
+     * @return \Illuminate\Support\HtmlString|string
      */
     protected function formatLine($line)
     {
+        if ($line instanceof HtmlString) {
+            return $line;
+        }
+
         if (is_array($line)) {
             return implode(' ', array_map('trim', $line));
         }