fix somethings

README.md

@@ -2,6 +2,32 @@
 
 ## Installation ##
 
+The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
+
+Either run
+
+```
+php composer.phar require --prefer-dist yarcode/yii2-email-manager "~0.2.*"
+```
+
+or add
+
+```
+"yarcode/yii2-email-manager": "~0.2.*"
+```
+
+to the require section of your `composer.json` file.
+
+## Migration ##
+
+Migration run
+
+```php
+php yii migrate --migrationPath=@vendor/yarcode/yii2-email-manager/src/migrations
+```
+
+## Configuration ##
+
 Simple configuration:
 
     'components' => [

composer.json

@@ -28,6 +28,7 @@
   "require": {
     "php": ">=5.4.0",
     "yiisoft/yii2": "~2.0.4",
+    "react/event-loop": "~0.4",
     "mailgun/mailgun-php": "^2.0",
     "yiisoft/yii2-twig": "~2.0.3",
     "trntv/yii2-aceeditor": "~2.0",

src/EmailManager.php

@@ -9,7 +9,7 @@
 use yii\base\Component;
 use yii\base\InvalidConfigException;
 use yarcode\email\interfaces\TransportInterface;
-use yarcode\email\models\Message;
+use yarcode\email\models\EmailMessage;
 
 class EmailManager extends Component implements TransportInterface
 {
@@ -73,7 +73,7 @@ public function queue($from, $to, $subject, $text, $priority = 0, $files = [], $
             $bcc = implode(', ', $bcc);
         }
 
-        $model = new Message();
+        $model = new EmailMessage();
         $model->from = $from;
         $model->to = $to;
         $model->subject = $subject;

src/backend/controllers/TemplateController.php

@@ -7,7 +7,7 @@
 use yii\filters\VerbFilter;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
-use yarcode\email\models\Template;
+use yarcode\email\models\EmailTemplate;
 
 /**
  * @author Alexey Samoylov <[email protected]>
@@ -40,7 +40,7 @@ public function behaviors()
      */
     public function actionTest($shortcut, $language)
     {
-        Template::loadTemplate($shortcut, $language)->queue(\Yii::$app->params['adminEmail']);
+        EmailTemplate::loadTemplate($shortcut, $language)->queue(\Yii::$app->params['adminEmail']);
 
         return $this->redirect(['index']);
     }
@@ -52,7 +52,7 @@ public function actionTest($shortcut, $language)
     public function actionIndex()
     {
         $dataProvider = new ActiveDataProvider([
-            'query' => Template::find(),
+            'query' => EmailTemplate::find(),
         ]);
 
         return $this->render('index', [
@@ -79,7 +79,7 @@ public function actionView($id)
      */
     public function actionCreate()
     {
-        $model = new Template();
+        $model = new EmailTemplate();
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['index', 'id' => $model->id]);
@@ -126,12 +126,12 @@ public function actionDelete($id)
      * Finds the Template model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
      * @param integer $id
-     * @return Template the loaded model
+     * @return EmailTemplate the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */
     protected function findModel($id)
     {
-        if (($model = Template::findOne($id)) !== null) {
+        if (($model = EmailTemplate::findOne($id)) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');

src/backend/views/template/_form.php

@@ -5,7 +5,7 @@
 
 /**
  * @var yii\web\View $this
- * @var yarcode\email\models\Template $model
+ * @var yarcode\email\models\EmailTemplate $model
  * @var yii\widgets\ActiveForm $form
  */
 ?>

src/backend/views/template/create.php

@@ -4,7 +4,7 @@
 
 /**
  * @var yii\web\View $this
- * @var yarcode\email\models\Template $model
+ * @var yarcode\email\models\EmailTemplate $model
  */
 
 $this->title = 'Create Email Template';

src/backend/views/template/update.php

@@ -4,7 +4,7 @@
 
 /**
  * @var yii\web\View $this
- * @var yarcode\email\models\Template $model
+ * @var yarcode\email\models\EmailTemplate $model
  */
 
 $this->title = 'Update Email Template: ' . ' ' . $model->id;

src/backend/views/template/view.php

@@ -5,7 +5,7 @@
 
 /**
  * @var yii\web\View $this
- * @var yarcode\email\models\Template $model
+ * @var yarcode\email\models\EmailTemplate $model
  */
 
 $this->title = $model->subject;

src/commands/EmailCommand.php

@@ -6,7 +6,7 @@
 use yii\console\Controller;
 use yii\db\Expression;
 use yarcode\email\EmailManager;
-use yarcode\email\models\Message;
+use yarcode\email\models\EmailMessage;
 
 /**
  * @author Alexey Samoylov <[email protected]>
@@ -81,23 +81,23 @@ public function sendOne() {
 
         $transaction = $db->beginTransaction();
         try {
-            $id = $db->createCommand('SELECT id FROM {{%email_message}} WHERE status=:status ORDER BY priority DESC, id ASC LIMIT 1 FOR UPDATE', [
-                'status' => Message::STATUS_NEW,
+            $id = $db->createCommand('SELECT id FROM {{%email_EmailMessage}} WHERE status=:status ORDER BY priority DESC, id ASC LIMIT 1 FOR UPDATE', [
+                'status' => EmailMessage::STATUS_NEW,
             ])->queryScalar();
 
             if ($id === false) {
-                $transaction->rollback();
+                $transaction->rollBack();
                 return false;
             }
 
-            /** @var Message $model */
-            $model = Message::findOne($id);
-            $model->status = Message::STATUS_IN_PROGRESS;
+            /** @var EmailMessage $model */
+            $model = EmailMessage::findOne($id);
+            $model->status = EmailMessage::STATUS_IN_PROGRESS;
             $model->updateAttributes(['status']);
 
             $transaction->commit();
         } catch (\Exception $e) {
-            $transaction->rollback();
+            $transaction->rollBack();
             throw $e;
         }
 
@@ -114,15 +114,15 @@ public function sendOne() {
             );
             if ($result) {
                 $model->sentAt = new Expression('NOW()');
-                $model->status = Message::STATUS_SENT;
+                $model->status = EmailMessage::STATUS_SENT;
             } else {
-                $model->status = Message::STATUS_ERROR;
+                $model->status = EmailMessage::STATUS_ERROR;
             }
 
             $model->updateAttributes(['sentAt', 'status']);
             $transaction->commit();
         } catch (\Exception $e) {
-            $transaction->rollback();
+            $transaction->rollBack();
             throw $e;
         }
 

src/models/Message.php → src/models/EmailMessage.php

@@ -3,7 +3,6 @@
 namespace yarcode\email\models;
 
 use baibaratsky\yii\behaviors\model\SerializedAttributes;
-use Yii;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
 use yii\db\Expression;
@@ -26,7 +25,7 @@
  * @property string $bcc
  * @property string $files
  */
-class Message extends ActiveRecord
+class EmailMessage extends ActiveRecord
 {
     const STATUS_NEW = 0;
     const STATUS_IN_PROGRESS = 1;

src/models/Template.php → src/models/EmailTemplate.php

@@ -4,7 +4,6 @@
 
 use yarcode\email\EmailManager;
 use yarcode\email\twig\EmailTemplateLoader;
-use Yii;
 use yii\db\ActiveRecord;
 use yii\helpers\VarDumper;
 
@@ -21,7 +20,7 @@
  * @property string $text
  * @property string $language
  */
-class Template extends ActiveRecord
+class EmailTemplate extends ActiveRecord
 {
     public $params = [];
 
@@ -36,24 +35,24 @@ public static function tableName()
     /**
      * @param string $shortcut
      * @param string $language
-     * @return Template
+     * @return self
      */
     public static function findByShortcut($shortcut, $language = null)
     {
         $manager = EmailManager::getInstance();
-
+	    $languageCode = $language;
         foreach ([$language, $manager->defaultLanguage, 'en-US'] as $l) {
             $template = static::findOne([
                 'shortcut' => $shortcut,
                 'language' => $l,
             ]);
-
+	        $languageCode = $l;
             if ($template) {
                 return $template;
             }
         }
 
-        throw new \BadMethodCallException('Template not found: ' . VarDumper::dumpAsString($shortcut) . ', language ' . $l);
+        throw new \BadMethodCallException('Template not found: ' . VarDumper::dumpAsString($shortcut) . ', language ' . $languageCode);
     }
 
     /**

src/twig/EmailTemplateLoader.php

@@ -7,7 +7,7 @@
 namespace yarcode\email\twig;
 
 use yarcode\email\EmailManager;
-use yarcode\email\models\Template;
+use yarcode\email\models\EmailTemplate;
 use yii\base\Component;
 use yii\helpers\ArrayHelper;
 
@@ -21,8 +21,8 @@ public function getSource($name)
         $currentLanguage = \Yii::$app->language;
         $defaultLanguage = ArrayHelper::getValue(EmailManager::getInstance()->languages, 0, 'en-US');
 
-        /** @var Template $model */
-        $model = Template::find()->where(['shortcut' => $name])
+        /** @var EmailTemplate $model */
+        $model = EmailTemplate::find()->where(['shortcut' => $name])
             ->andWhere('language = :currentLanguage OR language = :defaultLanguage OR language = :systemDefaultLanguage', [
                 ':currentLanguage' => $currentLanguage,
                 ':defaultLanguage' => $defaultLanguage,