Merge pull request #10920 from githubjeka/patch-1

Update phpDoc MailerInterface::compose()
This commit is contained in:
Dmitry Naumenko
2016-02-20 21:17:42 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -151,7 +151,7 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont
/** /**
* Creates a new message instance and optionally composes its body content via view rendering. * Creates a new message instance and optionally composes its body content via view rendering.
* *
* @param string|array $view the view to be used for rendering the message body. This can be: * @param string|array|null $view the view to be used for rendering the message body. This can be:
* *
* - a string, which represents the view name or path alias for rendering the HTML body of the email. * - a string, which represents the view name or path alias for rendering the HTML body of the email.
* In this case, the text body will be generated by applying `strip_tags()` to the HTML body. * In this case, the text body will be generated by applying `strip_tags()` to the HTML body.

View File

@@ -31,7 +31,7 @@ interface MailerInterface
/** /**
* Creates a new message instance and optionally composes its body content via view rendering. * Creates a new message instance and optionally composes its body content via view rendering.
* *
* @param string|array $view the view to be used for rendering the message body. This can be: * @param string|array|null $view the view to be used for rendering the message body. This can be:
* *
* - a string, which represents the view name or path alias for rendering the HTML body of the email. * - a string, which represents the view name or path alias for rendering the HTML body of the email.
* In this case, the text body will be generated by applying `strip_tags()` to the HTML body. * In this case, the text body will be generated by applying `strip_tags()` to the HTML body.