add missing classes to container initialization

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

View File

@ -4,7 +4,7 @@ namespace Da\User\Form;
use Da\User\Model\User;
use Da\User\Traits\ContainerTrait;
use dektrium\user\traits\ModuleTrait;
use Da\User\Traits\ModuleTrait;
use Yii;
use yii\base\Model;
@ -33,13 +33,13 @@ class RegistrationForm extends Model
public function rules()
{
/** @var User $user */
$user = $this->getClassMap()->get(User::class);
$user = $this->getClassMap()->get('User');
return [
// username rules
'usernameLength' => ['username', 'string', 'min' => 3, 'max' => 255],
'usernameTrim' => ['username', 'filter', 'filter' => 'trim'],
'usernamePattern' => ['username', 'match', 'pattern' => $user->usernameRegex],
'usernamePattern' => ['username', 'match', 'pattern' => '/^[-a-zA-Z0-9_\.@]+$/'],
'usernameRequired' => ['username', 'required'],
'usernameUnique' => [
'username',
@ -58,7 +58,7 @@ class RegistrationForm extends Model
'message' => Yii::t('user', 'This email address has already been taken')
],
// password rules
'passwordRequired' => ['password', 'required', 'skipOnEmpty' => $this->module->enableGeneratingPassword],
'passwordRequired' => ['password', 'required', 'skipOnEmpty' => $this->module->generatePasswords],
'passwordLength' => ['password', 'string', 'min' => 6, 'max' => 72],
];
}