bedezign / yii2-audit

src/views/error/view.php

Spacing +4 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 $this->title = Yii::t('audit', 'Error #{id}', ['id' => $model->id]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Errors'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = '#' . $model->id;
+$this->params['breadcrumbs'][] = '#'.$model->id;
 
 echo Html::tag('h1', $this->title);
 
@@ -44,16 +44,15 @@ 
         'line',
         [
             'header' => Yii::t('audit', 'Called'),
-            'value' => function ($data) {
+            'value' => function($data) {
                 return
                     isset($data['type']) ?
-                        (( isset($data['class']) ? $data['class'] : '[unknown]') . $data['type'] . $data['function']) :
-                        $data['function'];
+                        ((isset($data['class']) ? $data['class'] : '[unknown]').$data['type'].$data['function']) : $data['function'];
             }
         ],
         [
             'header' => Yii::t('audit', 'Args'),
-            'value' => function ($data) {
+            'value' => function($data) {
                 $out = '<a class="args-toggle glyphicon glyphicon-plus" href="javascript:void(0);"></a>';
                 $out .= '<pre style="display:none;">';
                 $out .= VarDumper::dumpAsString($data['args']);

src/views/javascript/view.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 $this->title = Yii::t('audit', 'Javascript #{id}', ['id' => $model->id]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Javascripts'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = '#' . $model->id;
+$this->params['breadcrumbs'][] = '#'.$model->id;
 
 echo Html::tag('h1', $this->title);
 

src/views/trail/index.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
             [
                 'attribute' => 'entry_id',
                 'class' => 'yii\grid\DataColumn',
-                'value' => function ($data) {
+                'value' => function($data) {
                     return $data->entry_id ? Html::a($data->entry_id, ['entry/view', 'id' => $data->entry_id]) : '';
                 },
                 'format' => 'raw',
@@ -36,7 +36,7 @@ 
                 'attribute' => 'user_id',
                 'label' => Yii::t('audit', 'User ID'),
                 'class' => 'yii\grid\DataColumn',
-                'value' => function ($data) {
+                'value' => function($data) {
                     return Audit::getInstance()->getUserIdentifier($data->user_id);
                 },
                 'format' => 'raw',
@@ -50,7 +50,7 @@ 
             'field',
             [
                 'label' => Yii::t('audit', 'Diff'),
-                'value' => function ($model) {
+                'value' => function($model) {
                     return $model->getDiffHtml();
                 },
                 'format' => 'raw',

src/views/trail/view.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $this->title = Yii::t('audit', 'Trail #{id}', ['id' => $model->id]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Trails'), 'url' => ['trail/index']];
-$this->params['breadcrumbs'][] = '#' . $model->id;
+$this->params['breadcrumbs'][] = '#'.$model->id;
 
 echo Html::tag('h1', $this->title);
 

src/views/mail/view.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $this->title = Yii::t('audit', 'Mail #{id}', ['id' => $model->id]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Mails'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = '#' . $model->id;
+$this->params['breadcrumbs'][] = '#'.$model->id;
 
 echo Html::tag('h1', $this->title);
 
@@ -49,7 +49,7 @@ 
 
 echo Html::tag('h2', Yii::t('audit', 'HTML'));
 echo '<div class="well">';
-echo '<iframe src="' . Url::to(['mail/view-html', 'id' => $model->id]) . '" style="width:100%;" onload="this.style.height = this.contentWindow.document.body.scrollHeight + \'px\';" frameborder="0"></iframe>';
+echo '<iframe src="'.Url::to(['mail/view-html', 'id' => $model->id]).'" style="width:100%;" onload="this.style.height = this.contentWindow.document.body.scrollHeight + \'px\';" frameborder="0"></iframe>';
 //echo Yii::$app->formatter->asHtml($model->html);
 echo '</div>';
 

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 /** @var View $this */
 /** @var AuditMail $model */
 
-use bedezign\yii2\audit\components\Helper;
 use bedezign\yii2\audit\models\AuditMail;
 use yii\helpers\Html;
 use yii\helpers\Url;

src/views/mail/view-html.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 $this->title = Yii::t('audit', 'Mail #{id}', ['id' => $model->id]);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Audit'), 'url' => ['default/index']];
 $this->params['breadcrumbs'][] = ['label' => Yii::t('audit', 'Mails'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = '#' . $model->id;
+$this->params['breadcrumbs'][] = '#'.$model->id;
 
 
 echo Yii::$app->formatter->asHtml($model->html);
\ No newline at end of file

src/AuditTrailBehavior.php

Indentation +2 added lines, -2 removed lines

@@ -218,8 +218,8 @@
         $query = new Query;
 
         $query->select($queryParams['returnField'])
-              ->from($queryParams['tableName'])
-              ->where([$queryParams['searchField'] => $searchFieldValue]);
+                ->from($queryParams['tableName'])
+                ->where([$queryParams['searchField'] => $searchFieldValue]);
 
         $rows = $query->all();
 

Braces +6 added lines, -4 removed lines

@@ -237,13 +237,15 @@
         $oldAttributes = $this->cleanAttributes($this->getOldAttributes());
 
         // ensure to handle serialized attributes properly
-        foreach($newAttributes as $key => $value)
-            if(is_array($newAttributes[$key]))
+        foreach($newAttributes as $key => $value) {
+                    if(is_array($newAttributes[$key]))
                 $newAttributes[$key] = Json::encode($newAttributes[$key]);
+        }
 
-        foreach($oldAttributes as $key => $value)
-            if(is_array($oldAttributes[$key]))
+        foreach($oldAttributes as $key => $value) {
+                    if(is_array($oldAttributes[$key]))
                 $oldAttributes[$key] = Json::encode($oldAttributes[$key]);
+        }
 
         // If no difference then get out of here
         if (count(array_diff_assoc($newAttributes, $oldAttributes)) <= 0) {

Spacing +7 added lines, -7 removed lines

@@ -180,7 +180,7 @@ 
      */
     protected function cleanAttributesIgnored($attributes)
     {
-        if(is_array($this->timestamp_fields) && count($this->timestamp_fields) > 0) {
+        if (is_array($this->timestamp_fields) && count($this->timestamp_fields) > 0) {
             $this->ignored = array_merge($this->ignored, $this->timestamp_fields);
         }
 
@@ -202,12 +202,12 @@ 
      */
     protected function cleanAttributesOverride($attributes)
     {
-        if (sizeof($this->override) > 0 && sizeof($attributes) >0) {
+        if (sizeof($this->override) > 0 && sizeof($attributes) > 0) {
             foreach ($this->override as $field => $queryParams) {
                 $newOverrideValues = $this->getNewOverrideValues($attributes[$field], $queryParams);
                 $saveField = \yii\helpers\ArrayHelper::getValue($queryParams, 'saveField', $field);
 
-                if (count($newOverrideValues) >1) {
+                if (count($newOverrideValues) > 1) {
                     $attributes[$saveField] = implode(', ',
                                         \yii\helpers\ArrayHelper::map($newOverrideValues, $queryParams['returnField'], $queryParams['returnField'])
                     );
@@ -249,12 +249,12 @@ 
         $oldAttributes = $this->cleanAttributes($this->getOldAttributes());
 
         // ensure to handle serialized attributes properly
-        foreach($newAttributes as $key => $value)
-            if(is_array($newAttributes[$key]))
+        foreach ($newAttributes as $key => $value)
+            if (is_array($newAttributes[$key]))
                 $newAttributes[$key] = Json::encode($newAttributes[$key]);
 
-        foreach($oldAttributes as $key => $value)
-            if(is_array($oldAttributes[$key]))
+        foreach ($oldAttributes as $key => $value)
+            if (is_array($oldAttributes[$key]))
                 $oldAttributes[$key] = Json::encode($oldAttributes[$key]);
 
         // If no difference then get out of here

src/commands/AuditController.php

Doc Comments +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
     /**
      * Cleans the AuditEntry data
      *
-     * @param $maxAge
+     * @param integer|null $maxAge
      * @return bool
      */
     protected function cleanupEntry($maxAge)
@@ -160,7 +160,7 @@ 
      * Cleans the Panel data
      *
      * @param $id
-     * @param $maxAge
+     * @param integer|null $maxAge
      * @return bool
      */
     protected function cleanupPanel($id, $maxAge)

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,11 +2,11 @@
 
 namespace bedezign\yii2\audit\commands;
 
+use Yii;
 use bedezign\yii2\audit\Audit;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\models\AuditEntry;
 use bedezign\yii2\audit\models\AuditError;
-use Yii;
 use yii\base\Exception;
 use yii\console\Controller;
 use yii\helpers\Console;

Spacing +14 added lines, -14 removed lines

@@ -113,9 +113,9 @@ 
 
         // heading
         $n = count($panels);
-        $this->stdout("Total $n " . ($n === 1 ? 'cleanup' : 'cleanups') . " to be applied:\n", Console::FG_YELLOW);
-        $this->stdout("\t" . 'DATA                      CLEANUP TO DATETIME' . "\n");
-        $this->stdout("\t" . '---------------------------------------------' . "\n");
+        $this->stdout("Total $n ".($n === 1 ? 'cleanup' : 'cleanups')." to be applied:\n", Console::FG_YELLOW);
+        $this->stdout("\t".'DATA                      CLEANUP TO DATETIME'."\n");
+        $this->stdout("\t".'---------------------------------------------'."\n");
 
         // audit panels
         foreach ($panels as $id) {
@@ -125,9 +125,9 @@ 
             $dots = str_repeat('.', 24 - strlen($id));
             if ($age !== null) {
                 $date = date('Y-m-d 23:59:59', strtotime("-$age days"));
-                $this->stdout("\t" . $id . ' ' . $dots . ' ' . $date . "\n");
+                $this->stdout("\t".$id.' '.$dots.' '.$date."\n");
             } else {
-                $this->stdout("\t" . $id . ' ' . $dots . ' no maxAge, skipping' . "\n");
+                $this->stdout("\t".$id.' '.$dots.' no maxAge, skipping'."\n");
             }
         }
 
@@ -135,12 +135,12 @@ 
         if ($entry) {
             $maxAge = $maxAge !== null ? $maxAge : $audit->maxAge;
             $date = $maxAge !== null ? date('Y-m-d 23:59:59', strtotime("-$maxAge days")) : 'no maxAge, skipping';
-            $this->stdout("\t" . 'AuditEntry .............. ' . $date . "\n");
+            $this->stdout("\t".'AuditEntry .............. '.$date."\n");
         }
 
         // audit entry solo
         if ($entrySolo) {
-            $this->stdout("\t" . 'AuditEntry solo ......... ' . date('Y-m-d 23:59:59') . "\n");
+            $this->stdout("\t".'AuditEntry solo ......... '.date('Y-m-d 23:59:59')."\n");
         }
 
         $this->stdout("\n");
@@ -165,11 +165,11 @@ 
         $count = AuditEntry::deleteAll(['<=', 'created', $date]);
         if ($count !== false) {
             $time = microtime(true) - $start;
-            $this->stdout("\n*** cleaned AuditEntry (records: " . $count . ",time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN);
+            $this->stdout("\n*** cleaned AuditEntry (records: ".$count.",time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN);
             return true;
         }
         $time = microtime(true) - $start;
-        $this->stdout("\n*** failed to clean AuditEntry (time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_RED);
+        $this->stdout("\n*** failed to clean AuditEntry (time: ".sprintf("%.3f", $time)."s)\n", Console::FG_RED);
         return false;
     }
 
@@ -204,7 +204,7 @@ 
             }
         }
         $time = microtime(true) - $start;
-        $this->stdout("\n*** cleaned AuditEntry (records: " . $count . ",time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN);
+        $this->stdout("\n*** cleaned AuditEntry (records: ".$count.",time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN);
         return true;
     }
 
@@ -229,11 +229,11 @@ 
         $count = $panel->cleanup($maxAge);
         if ($count !== false) {
             $time = microtime(true) - $start;
-            $this->stdout("\n*** cleaned $id (records: " . $count . ", time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_GREEN);
+            $this->stdout("\n*** cleaned $id (records: ".$count.", time: ".sprintf("%.3f", $time)."s)\n", Console::FG_GREEN);
             return true;
         }
         $time = microtime(true) - $start;
-        $this->stdout("\n*** failed to clean $id (time: " . sprintf("%.3f", $time) . "s)\n", Console::FG_RED);
+        $this->stdout("\n*** failed to clean $id (time: ".sprintf("%.3f", $time)."s)\n", Console::FG_RED);
         return false;
     }
 
@@ -265,13 +265,13 @@ 
                 ];
                 $message = [
                     'subject' => Yii::t('audit', 'Audit Error in Audit Entry #{entry_id}', $params),
-                    'text' => Yii::t('audit', '{message}' . "\n" . 'in {file} on line {line}.' . "\n" . '-- {url}', $params),
+                    'text' => Yii::t('audit', '{message}'."\n".'in {file} on line {line}.'."\n".'-- {url}', $params),
                     'html' => Yii::t('audit', '<b>{message}</b><br />in <i>{file}</i> on line <i>{line}</i>.<br/>-- {link}', $params),
                 ];
 
                 // send email
                 Yii::$app->mailer->compose()
-                    ->setFrom([$email => 'Audit :: ' . Yii::$app->name])
+                    ->setFrom([$email => 'Audit :: '.Yii::$app->name])
                     ->setTo($email)
                     ->setSubject($message['subject'])
                     ->setTextBody($message['text'])

src/views/mail/index.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             [
                 'attribute' => 'entry_id',
                 'class' => 'yii\grid\DataColumn',
-                'value' => function ($data) {
+                'value' => function($data) {
                     return $data->entry_id ? Html::a($data->entry_id, ['entry/view', 'id' => $data->entry_id]) : '';
                 },
                 'format' => 'raw',