Merge pull request tuyakhov#18 from tuyakhov/fix_active_record_channel

fix active record channel using populated model
makbeth · Nov 13, 2018 · d10f8f9 · d10f8f9
2 parents 4fc4071 + 6ac6bab
commit d10f8f9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 30 deletions.
diff --git a/src/channels/ActiveRecordChannel.php b/src/channels/ActiveRecordChannel.php
@@ -10,10 +10,8 @@
 use tuyakhov\notifications\NotifiableInterface;
 use tuyakhov\notifications\NotificationInterface;
 use yii\base\Component;
-use yii\base\DynamicModel;
-use yii\db\ActiveRecordInterface;
+use yii\base\InvalidConfigException;
 use yii\db\BaseActiveRecord;
-use yii\di\Instance;
 
 class ActiveRecordChannel extends Component implements ChannelInterface
 {
@@ -22,17 +20,14 @@ class ActiveRecordChannel extends Component implements ChannelInterface
      */
     public $model = 'tuyakhov\notifications\models\Notification';
 
-    /**
-     * @throws \yii\base\InvalidConfigException
-     */
-    public function init()
-    {
-        parent::init();
-        $this->model = Instance::ensure($this->model, 'yii\db\BaseActiveRecord');
-    }
-
     public function send(NotifiableInterface $recipient, NotificationInterface $notification)
     {
+        $model = \Yii::createObject($this->model);
+
+        if (!$model instanceof BaseActiveRecord) {
+            throw new InvalidConfigException('Model class must extend from \\yii\\db\\BaseActiveRecord');
+        }
+
         /** @var DatabaseMessage $message */
         $message = $notification->exportFor('database');
         list($notifiableType, $notifiableId) = $recipient->routeNotificationFor('database');
@@ -44,8 +39,8 @@ public function send(NotifiableInterface $recipient, NotificationInterface $noti
             'notifiable_id' => $notifiableId,
         ];
 
-        if ($this->model->load($data, '')) {
-            return $this->model->insert();
+        if ($model->load($data, '')) {
+            return $model->insert();
         }
 
         return false;

diff --git a/tests/ActiveRecordChannelTest.php b/tests/ActiveRecordChannelTest.php
@@ -24,25 +24,26 @@ public function testSend()
             'subject' => 'It',
             'body' => 'Works',
         ]);
-        $notificationModel = $this->createMock('yii\db\BaseActiveRecord');
-        $notificationModel->method('load')->willReturn(true);
-        $notificationModel->expects($this->once())
-            ->method('load')
-            ->with([
-                'level' => $message->level,
-                'subject' => $message->subject,
-                'body' => $message->body,
-                'notifiable_type' => 'yii\base\DynamicModel',
-                'notifiable_id' => 123,
-            ], '');
-        $notificationModel->method('insert')->willReturn(true);
-        $notificationModel->expects($this->once())
-            ->method('insert');
-
 
         $channel = \Yii::createObject([
             'class' => 'tuyakhov\notifications\channels\ActiveRecordChannel',
-            'model' => $notificationModel,
+            'model' => function () use ($message) {
+                $notificationModel = $this->createMock('yii\db\BaseActiveRecord');
+                $notificationModel->method('load')->willReturn(true);
+                $notificationModel->expects($this->once())
+                    ->method('load')
+                    ->with([
+                        'level' => $message->level,
+                        'subject' => $message->subject,
+                        'body' => $message->body,
+                        'notifiable_type' => 'yii\base\DynamicModel',
+                        'notifiable_id' => 123,
+                    ], '');
+                $notificationModel->method('insert')->willReturn(true);
+                $notificationModel->expects($this->once())
+                    ->method('insert');
+                return $notificationModel;
+            },
         ]);
 
         $notification = $this->createMock('tuyakhov\notifications\NotificationInterface');