Компонент для email'ов перемещён в common

api/models/authentication/ForgotPasswordForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace api\models\authentication;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\TotpValidator;
 use common\helpers\Error as E;

api/models/authentication/RegistrationForm.php

@@ -2,7 +2,7 @@
 namespace api\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use common\helpers\Error as E;
 use common\components\UserFriendlyRandomKey;

api/models/authentication/RepeatAccountActivationForm.php

@@ -2,7 +2,7 @@
 namespace api\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use common\helpers\Error as E;
 use common\components\UserFriendlyRandomKey;

api/models/profile/ChangeEmail/InitStateForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace api\models\profile\ChangeEmail;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\PasswordRequiredValidator;
 use common\helpers\Error as E;

api/models/profile/ChangeEmail/NewEmailForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace api\models\profile\ChangeEmail;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\EmailActivationKeyValidator;
 use common\models\Account;

common/emails/EmailHelper.php

@@ -1,12 +1,12 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
-use api\emails\templates\ChangeEmailConfirmCurrentEmail;
+use common\emails\templates\ChangeEmailConfirmCurrentEmail;
-use api\emails\templates\ChangeEmailConfirmNewEmail;
+use common\emails\templates\ChangeEmailConfirmNewEmail;
-use api\emails\templates\ForgotPasswordEmail;
+use common\emails\templates\ForgotPasswordEmail;
-use api\emails\templates\ForgotPasswordParams;
+use common\emails\templates\ForgotPasswordParams;
-use api\emails\templates\RegistrationEmail;
+use common\emails\templates\RegistrationEmail;
-use api\emails\templates\RegistrationEmailParams;
+use common\emails\templates\RegistrationEmailParams;
 use common\models\Account;
 use common\models\confirmations\CurrentEmailConfirmation;
 use common\models\confirmations\ForgotPassword;

common/emails/Template.php

@@ -1,7 +1,7 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
-use api\emails\exceptions\CannotSendEmailException;
+use common\emails\exceptions\CannotSendEmailException;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\mail\MailerInterface;

common/emails/TemplateWithRenderer.php

@@ -1,5 +1,5 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
 use common\components\EmailRenderer;
 use Yii;

common/emails/exceptions/CannotSendEmailException.php

@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\exceptions;
+namespace common\emails\exceptions;
 
 use Exception;
 

common/emails/templates/ChangeEmailConfirmCurrentEmail.php

@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\Template;
+use common\emails\Template;
 
 class ChangeEmailConfirmCurrentEmail extends Template {
 
@@ -21,8 +21,8 @@ class ChangeEmailConfirmCurrentEmail extends Template {
      */
     protected function getView() {
         return [
-            'html' => '@app/mails/current-email-confirmation-html',
+            'html' => '@api/mails/current-email-confirmation-html',
-            'text' => '@app/mails/current-email-confirmation-text',
+            'text' => '@api/mails/current-email-confirmation-text',
         ];
     }
 

common/emails/templates/ChangeEmailConfirmNewEmail.php

@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\Template;
+use common\emails\Template;
 
 class ChangeEmailConfirmNewEmail extends Template {
 
@@ -24,8 +24,8 @@ class ChangeEmailConfirmNewEmail extends Template {
      */
     protected function getView() {
         return [
-            'html' => '@app/mails/new-email-confirmation-html',
+            'html' => '@api/mails/new-email-confirmation-html',
-            'text' => '@app/mails/new-email-confirmation-text',
+            'text' => '@api/mails/new-email-confirmation-text',
         ];
     }
 

common/emails/templates/ForgotPasswordEmail.php

@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\TemplateWithRenderer;
+use common\emails\TemplateWithRenderer;
 
 class ForgotPasswordEmail extends TemplateWithRenderer {
 

common/emails/templates/ForgotPasswordParams.php

@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
 class ForgotPasswordParams {
 

common/emails/templates/RegistrationEmail.php

@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\TemplateWithRenderer;
+use common\emails\TemplateWithRenderer;
 
 class RegistrationEmail extends TemplateWithRenderer {
 

common/emails/templates/RegistrationEmailParams.php

@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
 class RegistrationEmailParams {