ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-12-02 11:41:05 +05:30
Code Issues Packages Projects Releases Wiki Activity

Немного приемственности в именовании сущностей

Browse Source
This commit is contained in:
ErickSkrauch 2016-05-10 23:28:04 +03:00
parent c6547b6540
commit 15922ba02e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/models/ForgotPasswordForm.php
View File

@ -5,7 +5,7 @@ use api\models\base\ApiForm;
use api\traits\AccountFinder; use api\traits\AccountFinder;
use common\components\UserFriendlyRandomKey; use common\components\UserFriendlyRandomKey;
use common\models\Account; use common\models\Account;
use common\models\confirmations\RecoverPassword; use common\models\confirmations\ForgotPassword;
use common\models\EmailActivation; use common\models\EmailActivation;
use Yii; use Yii;
use yii\base\ErrorException; use yii\base\ErrorException;
@ -59,7 +59,7 @@ class ForgotPasswordForm extends ApiForm {
$account = $this->getAccount(); $account = $this->getAccount();
$emailActivation = $this->getEmailActivation(); $emailActivation = $this->getEmailActivation();
if ($emailActivation === null) { if ($emailActivation === null) {
$emailActivation = new RecoverPassword(); $emailActivation = new ForgotPassword();
$emailActivation->account_id = $account->id; $emailActivation->account_id = $account->id;
} else { } else {
$emailActivation->created_at = time(); $emailActivation->created_at = time();

2
common/models/EmailActivation.php
View File

@ -73,7 +73,7 @@ class EmailActivation extends ActiveRecord {
public static function getClassMap() { public static function getClassMap() {
return [ return [
self::TYPE_REGISTRATION_EMAIL_CONFIRMATION => confirmations\RegistrationConfirmation::class, self::TYPE_REGISTRATION_EMAIL_CONFIRMATION => confirmations\RegistrationConfirmation::class,
self::TYPE_FORGOT_PASSWORD_KEY => confirmations\RecoverPassword::class, self::TYPE_FORGOT_PASSWORD_KEY => confirmations\ForgotPassword::class,
]; ];
} }

2
common/models/confirmations/RecoverPassword.php → common/models/confirmations/ForgotPassword.php
View File

@ -4,7 +4,7 @@ namespace common\models\confirmations;
use common\models\EmailActivation; use common\models\EmailActivation;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
class RecoverPassword extends EmailActivation { class ForgotPassword extends EmailActivation {
public function behaviors() { public function behaviors() {
return ArrayHelper::merge(parent::behaviors(), [ return ArrayHelper::merge(parent::behaviors(), [

2
tests/codeception/common/fixtures/data/email-activations.php
View File

@ -22,6 +22,6 @@ return [
'key' => 'H25HBDCHHAG2HGHGHS', 'key' => 'H25HBDCHHAG2HGHGHS',
'account_id' => 6, 'account_id' => 6,
'type' => \common\models\EmailActivation::TYPE_FORGOT_PASSWORD_KEY, 'type' => \common\models\EmailActivation::TYPE_FORGOT_PASSWORD_KEY,
'created_at' => time() - (new \common\models\confirmations\RecoverPassword())->repeatTimeout - 10, 'created_at' => time() - (new \common\models\confirmations\ForgotPassword())->repeatTimeout - 10,
], ],
]; ];

4
tests/codeception/common/unit/models/EmailActivationTest.php
View File

@ -2,7 +2,7 @@
namespace codeception\common\unit\models; namespace codeception\common\unit\models;
use Codeception\Specify; use Codeception\Specify;
use common\models\confirmations\RecoverPassword; use common\models\confirmations\ForgotPassword;
use common\models\confirmations\RegistrationConfirmation; use common\models\confirmations\RegistrationConfirmation;
use common\models\EmailActivation; use common\models\EmailActivation;
use tests\codeception\common\fixtures\EmailActivationFixture; use tests\codeception\common\fixtures\EmailActivationFixture;
@ -27,7 +27,7 @@ class EmailActivationTest extends DbTestCase {
]))->isInstanceOf(RegistrationConfirmation::class); ]))->isInstanceOf(RegistrationConfirmation::class);
expect(EmailActivation::findOne([ expect(EmailActivation::findOne([
'type' => EmailActivation::TYPE_FORGOT_PASSWORD_KEY, 'type' => EmailActivation::TYPE_FORGOT_PASSWORD_KEY,
]))->isInstanceOf(RecoverPassword::class); ]))->isInstanceOf(ForgotPassword::class);
}); });
} }