[5.4] Ensure Mailable view data is not overridden by order of operations #18322
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.
The
markdown()
,view()
andtext()
methods on theMailable
class currently override the instancesviewData
field with their own data parameter (which defaults to an empty array).This means if any of these methods are called after the
with()
method that the previous view data supplied in the call towith()
is lost.In the following case the view data is empty:
This pull request ensures the
viewData
is always merged with each subsequent call.Unit tests are provided which exhibit the incorrect behaviour.