a bit of cleanup

eluhr · eluhr · commit 40f4ce152c19 · 2019-02-07T19:24:20.000+01:00
diff --git a/src/Module.php b/src/Module.php
@@ -8,9 +8,7 @@
 class Module extends \yii\base\Module
 {
     use AccessBehaviorTrait;
-
-    public $controllerNamespace = 'dmstr\modules\prototype\controllers';
-
+    
     private $_view = null;
 
     public function beforeAction($action)
@@ -27,7 +25,7 @@ public function beforeAction($action)
      */
     public function getView(){
         if ($this->_view === null) {
-            $this->_view  = clone(\Yii::$app->getComponents(false)['view']);
+            $this->_view  = clone \Yii::$app->getComponents(false)['view'];
         }
         return $this->_view;
     }
diff --git a/src/commands/PrototypeController.php b/src/commands/PrototypeController.php
@@ -9,6 +9,10 @@
 
 namespace dmstr\modules\prototype\commands;
 
+use dmstr\modules\prototype\commands\actions\ExportAction;
+use dmstr\modules\prototype\models\Html;
+use dmstr\modules\prototype\models\Less;
+use dmstr\modules\prototype\models\Twig;
 use yii\console\Controller;
 use yii\console\ExitCode;
 use yii\helpers\Console;
@@ -48,18 +52,18 @@ public function actions()
     {
         $actions = parent::actions();
         $actions['export-html'] = [
-            'class' => 'dmstr\modules\prototype\commands\actions\ExportAction',
-            'modelClass' => 'dmstr\modules\prototype\models\Html',
+            'class' => ExportAction::class,
+            'modelClass' => Html::class,
             'extention' => 'html',
         ];
         $actions['export-less'] = [
-            'class' => 'dmstr\modules\prototype\commands\actions\ExportAction',
-            'modelClass' => 'dmstr\modules\prototype\models\Less',
+            'class' => ExportAction::class,
+            'modelClass' => Less::class,
             'extention' => 'less',
         ];
         $actions['export-twig'] = [
-            'class' => 'dmstr\modules\prototype\commands\actions\ExportAction',
-            'modelClass' => 'dmstr\modules\prototype\models\Twig',
+            'class' => ExportAction::class,
+            'modelClass' => Twig::class,
             'extention' => 'twig',
         ];
         return $actions;
diff --git a/src/commands/actions/ExportAction.php b/src/commands/actions/ExportAction.php
@@ -9,7 +9,13 @@
 
 namespace dmstr\modules\prototype\commands\actions;
 
+use dmstr\modules\prototype\commands\PrototypeController;
+use dmstr\modules\prototype\models\Html;
+use dmstr\modules\prototype\models\Less;
+use dmstr\modules\prototype\models\Twig;
+use const PHP_EOL;
 use yii\base\Action;
+use yii\base\ErrorException;
 use yii\console\ExitCode;
 use yii\db\ActiveRecord;
 use yii\helpers\Console;
@@ -32,9 +38,9 @@ class ExportAction extends Action
     public $extention;
 
     private static $availableModelTypes = [
-        'dmstr\modules\prototype\models\Html',
-        'dmstr\modules\prototype\models\Less',
-        'dmstr\modules\prototype\models\Twig'
+        Html::class,
+        Less::class,
+        Twig::class
     ];
 
     /**
@@ -45,7 +51,7 @@ class ExportAction extends Action
     protected function run()
     {
 
-        $this->controller->stdout("Exporting {$this->extention} files\n", Console::FG_BLUE);
+        $this->controller->stdout("Exporting {$this->extention} files" . PHP_EOL, Console::FG_BLUE);
         if (!class_exists($this->modelClass)) {
             $this->controller->stderr("Model class '{$this->modelClass}' does not exist", Console::FG_RED);
             return ExitCode::IOERR;
@@ -60,14 +66,14 @@ protected function run()
 
         try {
             if (!FileHelper::createDirectory($exportPath)) {
-                throw new \Exception("Error while creating directory '{$exportPath}'");
+                throw new ErrorException("Error while creating directory '{$exportPath}'");
             }
         } catch (\Exception $exception) {
-            $this->controller->stderr($exception->getMessage() . "\n", Console::FG_RED);
+            $this->controller->stderr($exception->getMessage() . PHP_EOL, Console::FG_RED);
             return ExitCode::IOERR;
         }
 
-        $entries = ($this->modelClass)::find()->all();
+        $entries = $this->modelClass::find()->all();
 
         foreach ($entries as $entry) {
             $fileName = $entry->key;
@@ -76,7 +82,7 @@ protected function run()
             }
             try {
                 if (file_put_contents($exportPath . DIRECTORY_SEPARATOR . $fileName . '.' . $this->extention, $entry->value) === false) {
-                    throw new \Exception("Error while writing file for key '{$entry->key}'");
+                    throw new ErrorException("Error while writing file for key '{$entry->key}'");
                 }
                 $this->controller->stdout('.');
             } catch (\Exception $exception) {
@@ -85,8 +91,7 @@ protected function run()
             }
         }
 
-
-        $this->controller->stdout("\nExported " . count($entries) . ' files to path ' . $exportPath . "\n", Console::FG_GREEN);
+        $this->controller->stdout(PHP_EOL . 'Exported ' . count($entries) . ' files to path ' . $exportPath . PHP_EOL, Console::FG_GREEN);
         return ExitCode::OK;
     }
 }
diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
@@ -2,7 +2,6 @@
 
 namespace dmstr\modules\prototype\controllers;
 
-use dmstr\web\traits\AccessBehaviorTrait;
 use yii\web\Controller;
 
 class DefaultController extends Controller
diff --git a/src/models/Html.php b/src/models/Html.php
@@ -2,8 +2,8 @@
 
 namespace dmstr\modules\prototype\models;
 
+use bedezign\yii2\audit\AuditTrailBehavior;
 use dmstr\modules\prototype\models\base\Html as BaseHtml;
-use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "app_html".
@@ -12,11 +12,8 @@ class Html extends BaseHtml
 {
     public function behaviors()
     {
-        return ArrayHelper::merge(
-            parent::behaviors(),
-            [
-                'bedezign\yii2\audit\AuditTrailBehavior',
-            ]
-        );
+        $behaviors = parent::behaviors();
+        $behaviors['audit-trail'] = AuditTrailBehavior::class;
+        return $behaviors;
     }
 }
diff --git a/src/models/Less.php b/src/models/Less.php
@@ -2,8 +2,8 @@
 
 namespace dmstr\modules\prototype\models;
 
+use bedezign\yii2\audit\AuditTrailBehavior;
 use dmstr\modules\prototype\models\base\Less as BaseLess;
-use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "app_less".
@@ -12,12 +12,9 @@ class Less extends BaseLess
 {
     public function behaviors()
     {
-        return ArrayHelper::merge(
-            parent::behaviors(),
-            [
-                'bedezign\yii2\audit\AuditTrailBehavior',
-            ]
-        );
+        $behaviors = parent::behaviors();
+        $behaviors['audit-trail'] = AuditTrailBehavior::class;
+        return $behaviors;
     }
 
     public function afterSave($insert, $changedAttributes)
diff --git a/src/models/Twig.php b/src/models/Twig.php
@@ -2,8 +2,8 @@
 
 namespace dmstr\modules\prototype\models;
 
+use bedezign\yii2\audit\AuditTrailBehavior;
 use dmstr\modules\prototype\models\base\Twig as BaseTwig;
-use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "app_twig".
@@ -12,11 +12,8 @@ class Twig extends BaseTwig
 {
     public function behaviors()
     {
-        return ArrayHelper::merge(
-            parent::behaviors(),
-            [
-                'bedezign\yii2\audit\AuditTrailBehavior',
-            ]
-        );
+        $behaviors = parent::behaviors();
+        $behaviors['audit-trail'] = AuditTrailBehavior::class;
+        return $behaviors;
     }
 }
diff --git a/src/views/default/index.php b/src/views/default/index.php
@@ -13,31 +13,31 @@
 
 <div class="row">
     <div class="col-sm-4">
-        <?= \insolita\wgadminlte\SmallBox::widget(
+        <?= SmallBox::widget(
             [
                 'head' => 'Less',
                 'type' => SmallBox::TYPE_LBLUE,
-                'icon' => 'fa fa-'.FA::_PENCIL_SQUARE,
+                'icon' => 'fa fa-' . FA::_PENCIL_SQUARE,
                 'footer' => 'Themes',
                 'footer_link' => ['/prototype/less'],
             ]) ?>
     </div>
     <div class="col-sm-4">
-        <?= \insolita\wgadminlte\SmallBox::widget(
+        <?= SmallBox::widget(
             [
                 'head' => 'Twig',
                 'type' => SmallBox::TYPE_ORANGE,
-                'icon' => 'fa fa-'.FA::_STICKY_NOTE,
+                'icon' => 'fa fa-' . FA::_STICKY_NOTE,
                 'footer' => 'Layouts',
                 'footer_link' => ['/prototype/twig'],
             ]) ?>
     </div>
     <div class="col-sm-4">
-        <?= \insolita\wgadminlte\SmallBox::widget(
+        <?= SmallBox::widget(
             [
                 'head' => 'HTML',
                 'type' => SmallBox::TYPE_MAR,
-                'icon' => 'fa fa-'.FA::_STICKY_NOTE_O,
+                'icon' => 'fa fa-' . FA::_STICKY_NOTE_O,
                 'footer' => 'Snippets',
                 'footer_link' => ['/prototype/html'],
             ]) ?>
diff --git a/src/views/default/test.php b/src/views/default/test.php
@@ -1,14 +1,17 @@
 <?php
 
+use dmstr\modules\prototype\assets\DbAsset;
+use dmstr\modules\prototype\widgets\TwigWidget;
+
 ?>
 
 <h2>Test</h2>
 
-<?php \dmstr\modules\prototype\assets\DbAsset::register($this) ?>
+<?php DbAsset::register($this) ?>
 
 
 
-<?= \dmstr\modules\prototype\widgets\TwigWidget::widget([
+<?= TwigWidget::widget([
     'id' => 'test',
     'enableFlash' => true,
 ]) ?>
diff --git a/src/widgets/HtmlWidget.php b/src/widgets/HtmlWidget.php
@@ -13,14 +13,26 @@
 use yii\base\Event;
 use yii\base\Widget;
 use yii\helpers\Html;
+use dmstr\modules\prototype\models\Html as HtmlModel;
 
+/**
+ *
+ * @property array $menuItems
+ * @property string|null $key
+ * @property string $moduleId
+ * @property bool $enableFlash
+ * @property bool $registerMenuItems
+ * @property bool $renderEmpty
+ * @property Html $_model
+ */
 class HtmlWidget extends Widget
 {
     const SETTINGS_SECTION = 'app.html';
     const ACCESS_ROLE = 'Editor';
 
     public $key = null;
     public $enableFlash = false;
+    public $moduleId = 'prototype';
     public $registerMenuItems = true;
     public $renderEmpty = true;
 
@@ -29,22 +41,22 @@ class HtmlWidget extends Widget
     public function init()
     {
         parent::init();
-        $this->_model = \dmstr\modules\prototype\models\Twig::findOne(['key' => $this->generateKey()]);
+        $this->_model = HtmlModel::findOne(['key' => $this->generateKey()]);
         if ($this->registerMenuItems) {
             \Yii::$app->trigger('registerMenuItems', new Event(['sender' => $this]));
         }
     }
 
     public function run()
     {
-        $this->_model = $model = \dmstr\modules\prototype\models\Html::findOne(['key' => $this->generateKey()]);
+        $this->_model = $model = HtmlModel::findOne(['key' => $this->generateKey()]);
         $html = '';
 
         if (\Yii::$app->user->can(self::ACCESS_ROLE)) {
-            $link = ($model) ? $this->generateEditLink($model->id) : $this->generateCreateLink();
+            $link = $model ? $this->generateEditLink($model->id) : $this->generateCreateLink();
             if ($this->enableFlash) {
                 \Yii::$app->session->addFlash(
-                    ($model) ? 'success' : 'info',
+                    $model ? 'success' : 'info',
                     "Edit contents in {$link}, key: <code>{$this->generateKey()}</code>"
                 );
             }
@@ -67,7 +79,7 @@ public function getMenuItems()
             [
                 'label' => ($this->_model ? FA::icon(FA::_EDIT) :
                         FA::icon(FA::_PLUS_SQUARE)).' <b>'.$this->generateKey().'</b> <span class="label label-danger">HTML</span>',
-                'url' => ($this->_model) ? $this->generateEditRoute($this->_model->id) : $this->generateCreateRoute(),
+                'url' => $this->_model ? $this->generateEditRoute($this->_model->id) : $this->generateCreateRoute(),
             ],
         ];
     }
@@ -76,32 +88,32 @@ private function generateKey()
     {
         if ($this->key) {
             return $this->key;
-        } else {
-            $key = \Yii::$app->request->getQueryParam('id');
         }
+
+        $key = \Yii::$app->request->getQueryParam('id');
         return \Yii::$app->language.'/'.\Yii::$app->controller->route.($key ? '/'.$key : '');
     }
 
     private function generateCreateLink()
     {
 
         return Html::a(FA::icon(FA::_PLUS_SQUARE) . ' HTML',
-            ['/prototype/html/create', 'Html' => ['key' => $this->generateKey()]]);
+            ['/' . $this->moduleId . '/html/create', 'Html' => ['key' => $this->generateKey()]]);
     }
 
     private function generateEditLink($id)
     {
-        return Html::a('prototype module', ['/prototype/html/update', 'id' => $id]);
+        return Html::a($this->moduleId . ' module', ['/' . $this->moduleId . '/html/update', 'id' => $id]);
     }
 
     private function generateCreateRoute()
     {
-        return ['/prototype/html/create', 'Html' => ['key' => $this->generateKey()]];
+        return ['/' . $this->moduleId . '/html/create', 'Html' => ['key' => $this->generateKey()]];
     }
 
     private function generateEditRoute($id)
     {
-        return ['/prototype/html/update', 'id' => $id];
+        return ['/' . $this->moduleId . '/html/update', 'id' => $id];
     }
 
     private function renderEmpty()
diff --git a/src/widgets/TwigWidget.php b/src/widgets/TwigWidget.php

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,7 @@`
`8`	`8`	`class Module extends \yii\base\Module`
`9`	`9`	`{`
`10`	`10`	`use AccessBehaviorTrait;`
`11`		`-`
`12`		`- public $controllerNamespace = 'dmstr\modules\prototype\controllers';`
`13`		`-`
	`11`	`+`
`14`	`12`	`private $_view = null;`
`15`	`13`
`16`	`14`	`public function beforeAction($action)`
`@@ -27,7 +25,7 @@ public function beforeAction($action)`
`27`	`25`	`*/`
`28`	`26`	`public function getView(){`
`29`	`27`	`if ($this->_view === null) {`
`30`		`- $this->_view = clone(\Yii::$app->getComponents(false)['view']);`
	`28`	`+ $this->_view = clone \Yii::$app->getComponents(false)['view'];`
`31`	`29`	`}`
`32`	`30`	`return $this->_view;`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace dmstr\modules\prototype\models;`
`4`	`4`
	`5`	`+use bedezign\yii2\audit\AuditTrailBehavior;`
`5`	`6`	`use dmstr\modules\prototype\models\base\Html as BaseHtml;`
`6`		`-use yii\helpers\ArrayHelper;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* This is the model class for table "app_html".`
`@@ -12,11 +12,8 @@ class Html extends BaseHtml`
`12`	`12`	`{`
`13`	`13`	`public function behaviors()`
`14`	`14`	`{`
`15`		`- return ArrayHelper::merge(`
`16`		`- parent::behaviors(),`
`17`		`- [`
`18`		`- 'bedezign\yii2\audit\AuditTrailBehavior',`
`19`		`- ]`
`20`		`- );`
	`15`	`+ $behaviors = parent::behaviors();`
	`16`	`+ $behaviors['audit-trail'] = AuditTrailBehavior::class;`
	`17`	`+ return $behaviors;`
`21`	`18`	`}`
`22`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,26 @@`
`13`	`13`	`use yii\base\Event;`
`14`	`14`	`use yii\base\Widget;`
`15`	`15`	`use yii\helpers\Html;`
	`16`	`+use dmstr\modules\prototype\models\Html as HtmlModel;`
`16`	`17`
	`18`	`+/**`
	`19`	`+ *`
	`20`	`+ * @property array $menuItems`
	`21`	`+ * @property string\|null $key`
	`22`	`+ * @property string $moduleId`
	`23`	`+ * @property bool $enableFlash`
	`24`	`+ * @property bool $registerMenuItems`
	`25`	`+ * @property bool $renderEmpty`
	`26`	`+ * @property Html $_model`
	`27`	`+ */`
`17`	`28`	`class HtmlWidget extends Widget`
`18`	`29`	`{`
`19`	`30`	`const SETTINGS_SECTION = 'app.html';`
`20`	`31`	`const ACCESS_ROLE = 'Editor';`
`21`	`32`
`22`	`33`	`public $key = null;`
`23`	`34`	`public $enableFlash = false;`
	`35`	`+ public $moduleId = 'prototype';`
`24`	`36`	`public $registerMenuItems = true;`
`25`	`37`	`public $renderEmpty = true;`
`26`	`38`
`@@ -29,22 +41,22 @@ class HtmlWidget extends Widget`
`29`	`41`	`public function init()`
`30`	`42`	`{`
`31`	`43`	`parent::init();`
`32`		`- $this->_model = \dmstr\modules\prototype\models\Twig::findOne(['key' => $this->generateKey()]);`
	`44`	`+ $this->_model = HtmlModel::findOne(['key' => $this->generateKey()]);`
`33`	`45`	`if ($this->registerMenuItems) {`
`34`	`46`	`\Yii::$app->trigger('registerMenuItems', new Event(['sender' => $this]));`
`35`	`47`	`}`
`36`	`48`	`}`
`37`	`49`
`38`	`50`	`public function run()`
`39`	`51`	`{`
`40`		`- $this->_model = $model = \dmstr\modules\prototype\models\Html::findOne(['key' => $this->generateKey()]);`
	`52`	`+ $this->_model = $model = HtmlModel::findOne(['key' => $this->generateKey()]);`
`41`	`53`	`$html = '';`
`42`	`54`
`43`	`55`	`if (\Yii::$app->user->can(self::ACCESS_ROLE)) {`
`44`		`- $link = ($model) ? $this->generateEditLink($model->id) : $this->generateCreateLink();`
	`56`	`+ $link = $model ? $this->generateEditLink($model->id) : $this->generateCreateLink();`
`45`	`57`	`if ($this->enableFlash) {`
`46`	`58`	`\Yii::$app->session->addFlash(`
`47`		`- ($model) ? 'success' : 'info',`
	`59`	`+ $model ? 'success' : 'info',`
`48`	`60`	`"Edit contents in {$link}, key: <code>{$this->generateKey()}</code>"`
`49`	`61`	`);`
`50`	`62`	`}`
`@@ -67,7 +79,7 @@ public function getMenuItems()`
`67`	`79`	`[`
`68`	`80`	`'label' => ($this->_model ? FA::icon(FA::_EDIT) :`
`69`	`81`	`FA::icon(FA::_PLUS_SQUARE)).' <b>'.$this->generateKey().'</b> <span class="label label-danger">HTML</span>',`
`70`		`- 'url' => ($this->_model) ? $this->generateEditRoute($this->_model->id) : $this->generateCreateRoute(),`
	`82`	`+ 'url' => $this->_model ? $this->generateEditRoute($this->_model->id) : $this->generateCreateRoute(),`
`71`	`83`	`],`
`72`	`84`	`];`
`73`	`85`	`}`
`@@ -76,32 +88,32 @@ private function generateKey()`
`76`	`88`	`{`
`77`	`89`	`if ($this->key) {`
`78`	`90`	`return $this->key;`
`79`		`- } else {`
`80`		`- $key = \Yii::$app->request->getQueryParam('id');`
`81`	`91`	`}`
	`92`	`+`
	`93`	`+ $key = \Yii::$app->request->getQueryParam('id');`
`82`	`94`	`return \Yii::$app->language.'/'.\Yii::$app->controller->route.($key ? '/'.$key : '');`
`83`	`95`	`}`
`84`	`96`
`85`	`97`	`private function generateCreateLink()`
`86`	`98`	`{`
`87`	`99`
`88`	`100`	`return Html::a(FA::icon(FA::_PLUS_SQUARE) . ' HTML',`
`89`		`- ['/prototype/html/create', 'Html' => ['key' => $this->generateKey()]]);`
	`101`	`+ ['/' . $this->moduleId . '/html/create', 'Html' => ['key' => $this->generateKey()]]);`
`90`	`102`	`}`
`91`	`103`
`92`	`104`	`private function generateEditLink($id)`
`93`	`105`	`{`
`94`		`- return Html::a('prototype module', ['/prototype/html/update', 'id' => $id]);`
	`106`	`+ return Html::a($this->moduleId . ' module', ['/' . $this->moduleId . '/html/update', 'id' => $id]);`
`95`	`107`	`}`
`96`	`108`
`97`	`109`	`private function generateCreateRoute()`
`98`	`110`	`{`
`99`		`- return ['/prototype/html/create', 'Html' => ['key' => $this->generateKey()]];`
	`111`	`+ return ['/' . $this->moduleId . '/html/create', 'Html' => ['key' => $this->generateKey()]];`
`100`	`112`	`}`
`101`	`113`
`102`	`114`	`private function generateEditRoute($id)`
`103`	`115`	`{`
`104`		`- return ['/prototype/html/update', 'id' => $id];`
	`116`	`+ return ['/' . $this->moduleId . '/html/update', 'id' => $id];`
`105`	`117`	`}`
`106`	`118`
`107`	`119`	`private function renderEmpty()`