Merge branch 'master' of git://github.com/yiisoft/yii2 into 9562-add-char-datatype

docs/guide-ru/README.md

@@ -112,7 +112,7 @@ All Rights Reserved.
 * [Аутентификация](security-authentication.md)
 * [Авторизация](security-authorization.md)
 * [Работа с паролями](security-passwords.md)
-* [Клиенты авторизации](https://github.com/yiisoft/yii2-authclient/blob/master/docs/guide/README.md)
+* [Клиенты авторизации](https://github.com/yiisoft/yii2-authclient/blob/master/docs/guide-ru/README.md)
 * [Лучшие практики](security-best-practices.md)
 
 

framework/mail/BaseMailer.php

@@ -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.
      *
-     * @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.
      *   In this case, the text body will be generated by applying `strip_tags()` to the HTML body.

framework/mail/MailerInterface.php

@@ -31,7 +31,7 @@ interface MailerInterface
     /**
      * 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.
      *   In this case, the text body will be generated by applying `strip_tags()` to the HTML body.