ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Написан тест для поведения beforeSave модели EmailActivation

Browse Source
This commit is contained in:
ErickSkrauch
2016-07-27 01:58:06 +03:00
parent c25bfeb8bc
commit ed6bc672cb
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/models/EmailActivation.php
View File

@@ -64,7 +64,7 @@ class EmailActivation extends ActiveRecord {
public static function instantiate($row) {
$type = ArrayHelper::getValue($row, 'type');
if ($type === null) {
return new static;
return parent::instantiate($row);
}
$classMap = self::getClassMap();
@@ -78,9 +78,9 @@ class EmailActivation extends ActiveRecord {
public static function getClassMap() {
return [
self::TYPE_REGISTRATION_EMAIL_CONFIRMATION => confirmations\RegistrationConfirmation::class,
self::TYPE_FORGOT_PASSWORD_KEY => confirmations\ForgotPassword::class,
self::TYPE_CURRENT_EMAIL_CONFIRMATION => confirmations\CurrentEmailConfirmation::class,
self::TYPE_NEW_EMAIL_CONFIRMATION => confirmations\NewEmailConfirmation::class,
self::TYPE_FORGOT_PASSWORD_KEY => confirmations\ForgotPassword::class,
self::TYPE_CURRENT_EMAIL_CONFIRMATION => confirmations\CurrentEmailConfirmation::class,
self::TYPE_NEW_EMAIL_CONFIRMATION => confirmations\NewEmailConfirmation::class,
];
}
@@ -91,11 +91,19 @@ class EmailActivation extends ActiveRecord {
if ($this->key === null) {
do {
$this->key = UserFriendlyRandomKey::make();
} while (EmailActivation::find()->andWhere(['key' => $this->key])->exists());
$this->key = $this->generateKey();
} while ($this->isKeyExists($this->key));
}
return true;
}
protected function generateKey() : string {
return UserFriendlyRandomKey::make();
}
protected function isKeyExists(string $key) : bool {
return self::find()->andWhere(['key' => $key])->exists();
}
}