[5.4] Check Htmlable contract instead of instanceof HtmlString in Mailer #18459
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbraud
changed the title
src/Illuminate/Mail/Mailer.php
Outdated
| use Illuminate\Contracts\View\Factory; | ||
| use Illuminate\Contracts\Events\Dispatcher; | ||
| use Illuminate\Contracts\Queue\ShouldQueue; | ||
| use Illuminate\Contracts\Mail\Mailer as MailerContract; | ||
| use Illuminate\Contracts\Queue\Factory as QueueContract; | ||
| use Illuminate\Contracts\Mail\Mailable as MailableContract; | ||
| use Illuminate\Contracts\Mail\MailQueue as MailQueueContract; | ||
| use Illuminate\Contracts\Support\Htmlable as HtmlableContract; |
There was a problem hiding this comment.
There's no need to alias this (the others have been aliased due to conflicts or ambiguity).
There was a problem hiding this comment.
Fair, spot of auto-pilot there. I'll sort that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check the Htmlable contract instead of the concrete HtmlString class when rendering the view in the Mailer class.
Reason being, it then allows packages to hook into the Mailer code without needing to inherit from the class, which is an issue I've come across.