update

Author: abude

CommentAsset.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace yii2mod\comments;
+namespace coderseden\cmt;
 
 use yii\web\AssetBundle;
 
 /**
  * Class CommentAsset
  *
- * @package yii2mod\comments
+ * @package coderseden\cmt
  */
 class CommentAsset extends AssetBundle
 {
     /**
      * @inheritdoc
      */
-    public $sourcePath = '@vendor/yii2mod/yii2-comments/assets';
+    public $sourcePath = '@vendor/coderseden/cmt/assets';
 
     /**
      * @inheritdoc

Module.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace yii2mod\comments;
+namespace coderseden\cmt;
 
 use Yii;
 
 /**
  * Class Module
  *
- * @package yii2mod\comments
+ * @package coderseden\cmt
  */
 class Module extends \yii\base\Module
 {
@@ -17,14 +17,14 @@ class Module extends \yii\base\Module
     public $userIdentityClass;
 
     /**
-     * @var string the class name of the comment model object, by default its yii2mod\comments\models\CommentModel
+     * @var string the class name of the comment model object, by default its coderseden\cmt\models\CommentModel
      */
-    public $commentModelClass = 'yii2mod\comments\models\CommentModel';
+    public $commentModelClass = 'coderseden\cmt\models\CommentModel';
 
     /**
      * @var string the namespace that controller classes are in
      */
-    public $controllerNamespace = 'yii2mod\comments\controllers';
+    public $controllerNamespace = 'coderseden\cmt\controllers';
 
     /**
      * @var bool when admin can edit comments on frontend
@@ -37,8 +37,9 @@ class Module extends \yii\base\Module
     public function init()
     {
         parent::init();
+
         if (null === $this->userIdentityClass) {
-            $this->userIdentityClass = ($this->params['commentsIdentityClass']) ? $this->params['commentsIdentityClass'] : Yii::$app->getUser()->identityClass;
+            $this->userIdentityClass = Yii::$app->getUser()->identityClass;
         }
     }
 }

README.md

@@ -8,11 +8,11 @@
 
 This module provides a comments managing system.
 
-[![Latest Stable Version](https://poser.pugx.org/yii2mod/yii2-comments/v/stable)](https://packagist.org/packages/yii2mod/yii2-comments) 
-[![Total Downloads](https://poser.pugx.org/yii2mod/yii2-comments/downloads)](https://packagist.org/packages/yii2mod/yii2-comments) 
-[![License](https://poser.pugx.org/yii2mod/yii2-comments/license)](https://packagist.org/packages/yii2mod/yii2-comments)
-[![Build Status](https://travis-ci.org/yii2mod/yii2-comments.svg?branch=master)](https://travis-ci.org/yii2mod/yii2-comments)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yii2mod/yii2-comments/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yii2mod/yii2-comments/?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/coderseden/cmt/v/stable)](https://packagist.org/packages/coderseden/cmt) 
+[![Total Downloads](https://poser.pugx.org/coderseden/cmt/downloads)](https://packagist.org/packages/coderseden/cmt) 
+[![License](https://poser.pugx.org/coderseden/cmt/license)](https://packagist.org/packages/coderseden/cmt)
+[![Build Status](https://travis-ci.org/coderseden/cmt.svg?branch=master)](https://travis-ci.org/coderseden/cmt)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/coderseden/cmt/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/coderseden/cmt/?branch=master)
 
 Installation
 ------------
@@ -22,13 +22,13 @@ The preferred way to install this extension is through [composer](http://getcomp
 Either run
 
 ```
-php composer.phar require --prefer-dist yii2mod/yii2-comments "*"
+php composer.phar require --prefer-dist coderseden/cmt "*"
 ```
 
 or add
 
 ```
-"yii2mod/yii2-comments": "*"
+"coderseden/cmt": "*"
 ```
 
 to the require section of your composer.json.
@@ -41,7 +41,7 @@ Configuration
 
 Before using Comments Widget, we'll also need to prepare the database.
 ```php
-php yii migrate --migrationPath=@vendor/yii2mod/yii2-comments/migrations
+php yii migrate --migrationPath=@vendor/coderseden/cmt/migrations
 ```
 
 **Module setup**
@@ -50,11 +50,11 @@ To access the module, you need to add the following code to your application con
 ```php
 'modules' => [
     'comment' => [
-        'class' => 'yii2mod\comments\Module',
+        'class' => 'coderseden\cmt\Module',
     ],
 ]
 ```
->**NOTE:** Module id must be `comment` and not otherwise. This is because it is referred [somewhere](https://github.com/yii2mod/yii2-comments/blob/master/traits/ModuleTrait.php#L20) in the code with such name. A PR to fix it to use configured module id is welcome.
+>**NOTE:** Module id must be `comment` and not otherwise. This is because it is referred [somewhere](https://github.com/coderseden/cmt/blob/master/traits/ModuleTrait.php#L20) in the code with such name. A PR to fix it to use configured module id is welcome.
 
 Now you can access to management section through the following URL:
 http://localhost/path/to/index.php?r=comments/index
@@ -91,27 +91,27 @@ Usage
 // the model to which are added comments, for example:
 $model = Post::find()->where(['title' => 'some post title'])->one();
 
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
     'model' => $model,
 ]); ?>
 ```
 
 **You can use your own template for render comments:**
 
   ```php
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
     'model' => $model,
     'commentView' => '@app/views/site/comments/index' // path to your template
 ]); ?>
   ```
 
 **Use the following code for multiple widgets on the same page:**
   ```php
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
         'model' => $model,
 ]); ?>
 
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
         'model' => $model2,
         'formId' => 'comment-form2',
         'pjaxContainerId' => 'unique-pjax-container-id'
@@ -120,7 +120,7 @@ $model = Post::find()->where(['title' => 'some post title'])->one();
 
 **To enable the pagination for comments list use the following code:**
 ```php
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
       'model' => $model,
       'dataProviderConfig' => [
           'pagination' => [
@@ -132,7 +132,7 @@ $model = Post::find()->where(['title' => 'some post title'])->one();
 
 **Advanced example:**
 ```php
-<?php echo \yii2mod\comments\widgets\Comment::widget([
+<?php echo \coderseden\cmt\widgets\Comment::widget([
       'model' => $model,
       'relatedTo' => 'User ' . \Yii::$app->user->identity->username . ' commented on the page ' . \yii\helpers\Url::current(),
       'maxLevel' => 2,
@@ -154,10 +154,10 @@ You may use the following events:
 ```php
 'modules' => [
     'comment' => [
-        'class' => 'yii2mod\comments\Module',
+        'class' => 'coderseden\cmt\Module',
         'controllerMap' => [
             'default' => [
-                'class' => 'yii2mod\comments\controllers\DefaultController',
+                'class' => 'coderseden\cmt\controllers\DefaultController',
                 'on beforeCreate' => function ($event) {
                     $event->getCommentModel();
                     // your custom code

composer.json

@@ -31,7 +31,7 @@
     },
     "autoload": {
         "psr-4": {
-            "yii2mod\\comments\\": ""
+            "coderseden\\cmt\\": ""
         }
     },
     "repositories": [

controllers/DefaultController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace yii2mod\comments\controllers;
+namespace coderseden\cmt\controllers;
 
 use Yii;
 use yii\filters\AccessControl;
@@ -11,41 +11,41 @@
 use yii\web\NotFoundHttpException;
 use yii\web\Response;
 use yii\widgets\ActiveForm;
-use yii2mod\comments\events\CommentEvent;
-use yii2mod\comments\models\CommentModel;
-use yii2mod\comments\traits\ModuleTrait;
+use coderseden\cmt\events\CommentEvent;
+use coderseden\cmt\models\CommentModel;
+use coderseden\cmt\traits\ModuleTrait;
 use yii2mod\editable\EditableAction;
 
 /**
  * Class DefaultController
  *
- * @package yii2mod\comments\controllers
+ * @package coderseden\cmt\controllers
  */
 class DefaultController extends Controller
 {
     use ModuleTrait;
 
     /**
      * Event is triggered before creating a new comment.
-     * Triggered with yii2mod\comments\events\CommentEvent
+     * Triggered with coderseden\cmt\events\CommentEvent
      */
     const EVENT_BEFORE_CREATE = 'beforeCreate';
 
     /**
      * Event is triggered after creating a new comment.
-     * Triggered with yii2mod\comments\events\CommentEvent
+     * Triggered with coderseden\cmt\events\CommentEvent
      */
     const EVENT_AFTER_CREATE = 'afterCreate';
 
     /**
      * Event is triggered before deleting the comment.
-     * Triggered with yii2mod\comments\events\CommentEvent
+     * Triggered with coderseden\cmt\events\CommentEvent
      */
     const EVENT_BEFORE_DELETE = 'beforeDelete';
 
     /**
      * Event is triggered after deleting the comment.
-     * Triggered with yii2mod\comments\events\CommentEvent
+     * Triggered with coderseden\cmt\events\CommentEvent
      */
     const EVENT_AFTER_DELETE = 'afterDelete';
 
@@ -109,9 +109,7 @@ public function actionCreate($entity)
         $event = Yii::createObject(['class' => CommentEvent::class, 'commentModel' => $commentModel]);
         $commentModel->setAttributes($this->getCommentAttributesFromEntity($entity));
         $this->trigger(self::EVENT_BEFORE_CREATE, $event);
-
         if ($commentModel->load(Yii::$app->request->post()) && $commentModel->saveComment()) {
-
             $this->trigger(self::EVENT_AFTER_CREATE, $event);
 
             return ['status' => 'success'];

controllers/ManageController.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace yii2mod\comments\controllers;
+namespace coderseden\cmt\controllers;
 
 use Yii;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
-use yii2mod\comments\models\CommentModel;
-use yii2mod\comments\traits\ModuleTrait;
+use coderseden\cmt\models\CommentModel;
+use coderseden\cmt\traits\ModuleTrait;
 
 /**
  * Class ManageController
  *
- * @package yii2mod\comments\controllers
+ * @package coderseden\cmt\controllers
  */
 class ManageController extends Controller
 {
@@ -20,17 +20,17 @@ class ManageController extends Controller
     /**
      * @var string path to index view file, which is used in admin panel
      */
-    public $indexView = '@vendor/yii2mod/yii2-comments/views/manage/index';
+    public $indexView = '@vendor/coderseden/cmt/views/manage/index';
 
     /**
      * @var string path to update view file, which is used in admin panel
      */
-    public $updateView = '@vendor/yii2mod/yii2-comments/views/manage/update';
+    public $updateView = '@vendor/coderseden/cmt/views/manage/update';
 
     /**
      * @var string search class name for searching
      */
-    public $searchClass = 'yii2mod\comments\models\search\CommentSearch';
+    public $searchClass = 'coderseden\cmt\models\search\CommentSearch';
 
     /**
      * @var array verb filter config

events/CommentEvent.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace yii2mod\comments\events;
+namespace coderseden\cmt\events;
 
 use yii\base\Event;
-use yii2mod\comments\models\CommentModel;
+use coderseden\cmt\models\CommentModel;
 
 /**
  * Class CommentEvent
  *
- * @package yii2mod\comments\events
+ * @package coderseden\cmt\events
  */
 class CommentEvent extends Event
 {

models/CommentModel.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace yii2mod\comments\models;
+namespace coderseden\cmt\models;
 
 use paulzi\adjacencyList\AdjacencyListBehavior;
 use Yii;
-use yii2mod\comments\behaviors\BlameableBehavior;
+use yii\behaviors\BlameableBehavior;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
 use yii\helpers\ArrayHelper;
 use yii2mod\behaviors\PurifyBehavior;
-use yii2mod\comments\traits\ModuleTrait;
+use coderseden\cmt\traits\ModuleTrait;
 use yii2mod\moderation\enums\Status;
 use yii2mod\moderation\ModerationBehavior;
 use yii2mod\moderation\ModerationQuery;
@@ -220,9 +220,6 @@ public function saveComment()
      */
     public function getAuthor()
     {
-	    if (app()->getModule('comment')->params['commentsIdentityPrimaryId']) {
-		    return $this->hasOne($this->getModule()->userIdentityClass, [app()->getModule('comment')->params['commentsIdentityPrimaryId'] => 'createdBy']);
-	    }
         return $this->hasOne($this->getModule()->userIdentityClass, ['id' => 'createdBy']);
     }
 

models/search/CommentSearch.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace yii2mod\comments\models\search;
+namespace coderseden\cmt\models\search;
 
 use yii\data\ActiveDataProvider;
-use yii2mod\comments\models\CommentModel;
+use coderseden\cmt\models\CommentModel;
 
 /**
  * Class CommentSearch
  *
- * @package yii2mod\comments\models\search
+ * @package coderseden\cmt\models\search
  */
 class CommentSearch extends CommentModel
 {

traits/ModuleTrait.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace yii2mod\comments\traits;
+namespace coderseden\cmt\traits;
 
 use Yii;
-use yii2mod\comments\Module;
+use coderseden\cmt\Module;
 
 /**
  * Class ModuleTrait
  *
- * @package yii2mod\comments\traits
+ * @package coderseden\cmt\traits
  */
 trait ModuleTrait
 {