[Mailer] Fix rendered templates for notifications #48505
Merged
Conversation
This file contains hidden or 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
9501407 to
87276fb
Compare
|
looks like we need to bump the minimum allowed version of |
87276fb to
ba1bd59
Compare
46d2f8a to
bf9aea9
Compare
HeahDude
reviewed
Dec 6, 2022
| if (3 === \count($data)) { | ||
| if (4 === \count($data)) { | ||
| [$this->context, $this->theme, $this->rendered, $parentData] = $data; | ||
| } elseif (3 === \count($data)) { | ||
| [$this->context, $this->theme, $parentData] = $data; |
There was a problem hiding this comment.
Is worth adding a comment as done two lines below or should it be updated to cover this new case?
| @@ -67,6 +67,18 @@ public function getContext(): array | ||
| return $this->context; | ||
| } | ||
|
|
||
| public function isRendered(): bool | ||
| { | ||
| return null === $this->htmlTemplate && null === $this->textTemplate; |
There was a problem hiding this comment.
Why not using a boolean property as done in the other class?
Setting those to null in the next method could lead to inconsistency?
bf9aea9 to
677e188
Compare
677e188 to
085185d
Compare
nicolas-grekas
approved these changes
Dec 6, 2022
HeahDude
reviewed
Dec 6, 2022
| @@ -76,7 +76,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa | ||
| $envelope = $event->getEnvelope(); | ||
| $message = $event->getMessage(); | ||
|
|
||
| if ($message instanceof TemplatedEmail && ($message->getTextTemplate() || $message->getHtmlTemplate())) { | ||
| if ($message instanceof TemplatedEmail && !$message->isRendered()) { |
There was a problem hiding this comment.
The behavior seems different here now, the error may be that the template has already been rendered.
Merged
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.
Alternative to #48481