leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing classes to container initialization

Browse Source
This commit is contained in:
Antonio Ramirez
2016-12-11 01:42:11 +01:00
parent 76e49ca1a7
commit d8e517a9d1
6 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/User/Model/User.php
View File

@ -47,10 +47,6 @@ class User extends ActiveRecord implements IdentityInterface
const OLD_EMAIL_CONFIRMED = 0b1;
const NEW_EMAIL_CONFIRMED = 0b10;
/**
* @var string default user name regular expression.
*/
public $usernameRegex = '/^[-a-zA-Z0-9_\.@]+$/';
/**
* @var string Plain password. Used for model validation.
*/
@ -143,7 +139,7 @@ class User extends ActiveRecord implements IdentityInterface
return [
// username rules
'usernameRequired' => ['username', 'required', 'on' => ['register', 'create', 'connect', 'update']],
'usernameMatch' => ['username', 'match', 'pattern' => $this->usernameRegex],
'usernameMatch' => ['username', 'match', 'pattern' => '/^[-a-zA-Z0-9_\.@]+$/'],
'usernameLength' => ['username', 'string', 'min' => 3, 'max' => 255],
'usernameTrim' => ['username', 'trim'],
'usernameUnique' => [
@ -242,7 +238,7 @@ class User extends ActiveRecord implements IdentityInterface
*/
public function getProfile()
{
return $this->hasOne($this->getClassMap()->get(Profile::class), ['user_id' => 'id']);
return $this->hasOne($this->getClassMap()->get('Profile'), ['user_id' => 'id']);
}
/**