Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style
* 'feature' of https://github.com/mongosoft/yii2: returned back formatting language files code style. WHILE code style. FOR code style. FOREACH code style. operator IF @param, @var, @property and @return must declare types as boolean, integer, string, array or null short echo tags short array syntax Conflicts: extensions/apidoc/commands/RenderController.php extensions/apidoc/models/BaseDoc.php extensions/apidoc/models/Context.php extensions/apidoc/templates/bootstrap/Renderer.php extensions/apidoc/templates/bootstrap/layouts/guide.php extensions/apidoc/templates/bootstrap/layouts/main.php extensions/apidoc/templates/bootstrap/views/index.php extensions/apidoc/templates/html/Renderer.php extensions/apidoc/templates/offline/views/index.php extensions/apidoc/templates/offline/views/offline.php extensions/apidoc/templates/online/views/index.php extensions/elasticsearch/Connection.php extensions/redis/ActiveQuery.php framework/base/ErrorException.php framework/helpers/BaseFileHelper.php tests/unit/framework/helpers/FileHelperTest.php
This commit is contained in:
commit
0055e1ab31
@ -92,7 +92,7 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
|
||||
* Validates password
|
||||
*
|
||||
* @param string $password password to validate
|
||||
* @return bool if password provided is valid for current user
|
||||
* @return boolean if password provided is valid for current user
|
||||
*/
|
||||
public function validatePassword($password)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user