Merge pull request #260 from liasica/master

Support custome TimestampBehavior
schmunk42 · Aug 1, 2019 · cfde783 · cfde783
2 parents 1cb6245 + 3f7ba0b
commit cfde783
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/commands/BatchController.php b/src/commands/BatchController.php
@@ -33,6 +33,11 @@ class BatchController extends Controller
      */
     public $useTimestampBehavior = true;
 
+    /**
+     * @var string support user custom TimestampBehavior class
+     */
+    public $timestampBehaviorClass = 'yii\behaviors\TimestampBehavior';
+
     /**
      * @var string the name of the column where the user who updated the entry is stored
      */
@@ -205,7 +210,7 @@ class BatchController extends Controller
      * @var bool whether to generate access filter migrations
      */
     public $generateAccessFilterMigrations;
-    
+
     public $crudBaseTraits;
 
     public $crudTemplate = 'default';
@@ -273,6 +278,7 @@ public function options($id)
                 'template',
                 'overwrite',
                 'useTimestampBehavior',
+                'timestampBehaviorClass',
                 'createdAtColumn',
                 'updatedAtColumn',
                 'useTranslatableBehavior',
@@ -380,6 +386,7 @@ public function actionModels()
                 'interactive' => $this->interactive,
                 'overwrite' => $this->overwrite,
                 'useTimestampBehavior' => $this->useTimestampBehavior,
+                'timestampBehaviorClass' => $this->timestampBehaviorClass,
                 'createdAtColumn' => $this->createdAtColumn,
                 'updatedAtColumn' => $this->updatedAtColumn,
                 'useTranslatableBehavior' => $this->useTranslatableBehavior,

diff --git a/src/generators/model/Generator.php b/src/generators/model/Generator.php
@@ -57,6 +57,11 @@ class Generator extends \yii\gii\generators\model\Generator
      */
     public $useTimestampBehavior = true;
 
+    /**
+     * @var string support user custom TimestampBehavior class
+     */
+    public $timestampBehaviorClass = 'yii\behaviors\TimestampBehavior';
+
     /**
      * @var string the name of the column where the user who updated the entry is stored
      */
@@ -147,7 +152,7 @@ public function rules()
                     'useTimestampBehavior',
                     'singularEntities',
                     ], 'boolean'],
-                [['languageTableName', 'languageCodeColumn', 'createdByColumn', 'updatedByColumn', 'createdAtColumn', 'updatedAtColumn', 'savedForm'], 'string'],
+                [['languageTableName', 'languageCodeColumn', 'createdByColumn', 'updatedByColumn', 'createdAtColumn', 'updatedAtColumn', 'savedForm', 'timestampBehaviorClass'], 'string'],
                 [['tablePrefix'], 'safe'],
             ]
         );
@@ -188,6 +193,7 @@ public function formAttributes()
             'useTimestampBehavior',
             'createdAtColumn',
             'updatedAtColumn',
+            'timestampBehaviorClass',
             ];
     }
 
@@ -221,6 +227,7 @@ public function hints()
                 'generateHintsFromComments' => 'This indicates whether the generator should generate attribute hints
                     by using the comments of the corresponding DB columns.',
                 'useTimestampBehavior' => 'Use <code>TimestampBehavior</code> for tables with column(s) for created at and/or updated at timestamps.',
+                'timestampBehaviorClass' => 'Use custom TimestampBehavior class.',
                 'createdAtColumn' => 'The column name where the created at timestamp is stored.',
                 'updatedAtColumn' => 'The column name where the updated at timestamp is stored.',
                 'useBlameableBehavior' => 'Use <code>BlameableBehavior</code> for tables with column(s) for created by and/or updated by user IDs.',
@@ -678,8 +685,9 @@ protected function generateTimestamp($table)
 
         if ($this->useTimestampBehavior && ($createdAt || $updatedAt)) {
             return [
-                'createdAtAttribute' => $createdAt,
-                'updatedAtAttribute' => $updatedAt,
+                'createdAtAttribute'     => $createdAt,
+                'updatedAtAttribute'     => $updatedAt,
+                'timestampBehaviorClass' => $this->timestampBehaviorClass,
             ];
         }
 

diff --git a/src/generators/model/default/model.php b/src/generators/model/default/model.php
@@ -32,7 +32,7 @@
 use yii\behaviors\BlameableBehavior;
 <?php endif; ?>
 <?php if (!empty($timestamp)): ?>
-use yii\behaviors\TimestampBehavior;
+use <?php echo $timestamp['timestampBehaviorClass']; ?>;
 <?php endif; ?>
 
 /**