bedezign / yii2-audit

src/panels/CurlPanel.php

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

@@ -8,8 +8,8 @@
 
 use Yii;
 use bedezign\yii2\audit\components\panels\DataStoragePanel;
-use yii\grid\GridViewAsset;
 use yii\data\ArrayDataProvider;
+use yii\grid\GridViewAsset;
 
 /**
  * Class CurlPanel

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->data) . ')</small>';
+        return $this->getName().' <small>('.count($this->data).')</small>';
     }
 
     /**
@@ -137,7 +137,7 @@ 
         }
 
         if ($this->content)
-            $this->data[$id]['content']= curl_multi_getcontent($handle);
+            $this->data[$id]['content'] = curl_multi_getcontent($handle);
 
         // Cleanup empty things
         $this->data[$id] = array_filter($this->data[$id]);
@@ -208,7 +208,7 @@ 
         if (!is_resource($resource))
             return false;
 
-        $parts = explode('#', (string)$resource);
+        $parts = explode('#', (string) $resource);
         return array_pop($parts);
     }
 

Braces +18 added lines, -12 removed lines

@@ -96,19 +96,22 @@ 
             curl_setopt($handle, CURLOPT_URL, $url);
         }
 
-        if ($postData)
-            $this->data[$id]['post'] = $postData;
+        if ($postData) {
+                    $this->data[$id]['post'] = $postData;
+        }
 
-        if ($this->headers)
-            curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        if ($this->headers) {
+                    curl_setopt($handle, CURLOPT_HEADERFUNCTION, [$this, 'captureHeader']);
+        }
 
         if ($this->log) {
             curl_setopt($handle, CURLOPT_VERBOSE, true);
             curl_setopt($handle, CURLOPT_STDERR, $this->_logHandles[$id] = fopen('php://temp', 'rw+'));
         }
 
-        if ($this->content)
-            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        if ($this->content) {
+                    curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+        }
 
         return true;
     }
@@ -136,8 +139,9 @@ 
             unset($this->_logHandles[$id]);
         }
 
-        if ($this->content)
-            $this->data[$id]['content']= curl_multi_getcontent($handle);
+        if ($this->content) {
+                    $this->data[$id]['content']= curl_multi_getcontent($handle);
+        }
 
         // Cleanup empty things
         $this->data[$id] = array_filter($this->data[$id]);
@@ -192,8 +196,9 @@ 
     public function captureHeader($handle, $header)
     {
         $id = $this->id($handle);
-        if (!isset($this->data[$id]['headers']))
-            $this->data[$id]['headers'] = [];
+        if (!isset($this->data[$id]['headers'])) {
+                    $this->data[$id]['headers'] = [];
+        }
 
         $this->data[$id]['headers'][] = $header;
         return strlen($header);
@@ -205,8 +210,9 @@ 
      */
     protected function id($resource)
     {
-        if (!is_resource($resource))
-            return false;
+        if (!is_resource($resource)) {
+                    return false;
+        }
 
         $parts = explode('#', (string)$resource);
         return array_pop($parts);

src/panels/MailPanel.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     /**
      * @param Event $event
-     * @return null|static
+     * @return AuditMail|null
      */
     public function record($event)
     {

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

@@ -2,14 +2,14 @@
 
 namespace bedezign\yii2\audit\panels;
 
-use bedezign\yii2\audit\Audit;
-use bedezign\yii2\audit\components\panels\Panel;
-use bedezign\yii2\audit\models\AuditMail;
-use bedezign\yii2\audit\models\AuditMailSearch;
 use Swift_Message;
 use Swift_Mime_Attachment;
 use Swift_Mime_MimePart;
 use Yii;
+use bedezign\yii2\audit\Audit;
+use bedezign\yii2\audit\components\panels\Panel;
+use bedezign\yii2\audit\models\AuditMail;
+use bedezign\yii2\audit\models\AuditMailSearch;
 use yii\base\Event;
 use yii\grid\GridViewAsset;
 use yii\mail\BaseMailer;

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     public function init()
     {
         parent::init();
-        Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function ($event) {
+        Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function($event) {
             $this->record($event);
         });
     }
@@ -115,7 +115,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->_model->mails) . ')</small>';
+        return $this->getName().' <small>('.count($this->_model->mails).')</small>';
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -87,8 +87,9 @@
     public function cleanup($maxAge = null)
     {
         $maxAge = $maxAge !== null ? $maxAge : $this->maxAge;
-        if ($maxAge === null)
-            return false;
+        if ($maxAge === null) {
+                    return false;
+        }
         return AuditTrail::deleteAll([
             '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days"))
         ]);

src/panels/ProfilingPanel.php

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

@@ -2,8 +2,8 @@
 
 namespace bedezign\yii2\audit\panels;
 
-use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use Yii;
+use bedezign\yii2\audit\components\panels\DataStoragePanelTrait;
 use yii\debug\models\search\Profile;
 use yii\grid\GridViewAsset;
 

Spacing +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@ 
     public function getLabel()
     {
         $memory = sprintf('%.1f MB', $this->data['memory'] / 1048576);
-        $time = number_format($this->data['time'] * 1000) . ' ms';
-        return $this->getName() . ' <small>(' . $memory . ' / ' . $time . ')</small>';
+        $time = number_format($this->data['time'] * 1000).' ms';
+        return $this->getName().' <small>('.$memory.' / '.$time.')</small>';
     }
 
     /**
@@ -38,7 +38,7 @@ 
             'dataProvider' => $dataProvider,
             'searchModel' => $searchModel,
             'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576),
-            'time' => number_format($this->data['time'] * 1000) . ' ms',
+            'time' => number_format($this->data['time'] * 1000).' ms',
         ]);
     }
 

src/panels/SoapPanel.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace bedezign\yii2\audit\panels;
 
 use Yii;
-use bedezign\yii2\audit\models\AuditError;
 use bedezign\yii2\audit\components\panels\DataStoragePanel;
 use yii\data\ArrayDataProvider;
 

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->data) . ')</small>';
+        return $this->getName().' <small>('.count($this->data).')</small>';
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -35,8 +35,9 @@
     {
         $this->module->registerPanel($this);
 
-        if (!is_array($this->data))
-            $this->data = [];
+        if (!is_array($this->data)) {
+                    $this->data = [];
+        }
 
         if (isset($data['error'])) {
             $error = $this->module->exception($data['error']);

src/views/entry/panels/soap/detail.php

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

@@ -1,10 +1,10 @@
 <?php
 /* @var $panel bedezign\yii2\audit\panels\SoapPanel */
 
-use yii\bootstrap\Tabs;
-use yii\helpers\Html;
 use bedezign\yii2\audit\components\Helper;
+use yii\bootstrap\Tabs;
 use yii\helpers\ArrayHelper;
+use yii\helpers\Html;
 use yii\helpers\VarDumper;
 
 $preformatted = ['class' => 'well', 'style' => 'overflow: auto; white-space: pre'];

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
     unset($request['result']);
 }
 
-$tabs[] = [ 'label' => \Yii::t('audit', 'Info'), 'content' => $this->render('info_table', ['request' => $request]), 'active' => true ];
+$tabs[] = ['label' => \Yii::t('audit', 'Info'), 'content' => $this->render('info_table', ['request' => $request]), 'active' => true];
 
 echo Html::tag('h2', \Yii::t('audit', 'Request #{id}', ['id' => $index])), Tabs::widget(['items' => array_reverse($tabs)]);

Braces +3 added lines, -2 removed lines

@@ -24,11 +24,12 @@
 
 if (isset($request['result'])) {
     $xml = Helper::formatAsXML($request['result']);
-    if ($xml)
-        $tabs[] = [
+    if ($xml) {
+            $tabs[] = [
             'label' => \Yii::t('audit', 'Result - XML'),
             'content' => Html::tag('div', $xml, $preformatted)
         ];
+    }
 
     $tabs[] = [
         'label' => \Yii::t('audit', 'Result'),

src/views/entry/panels/soap/info_table.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use yii\helpers\Html;
 use yii\helpers\VarDumper;
-use yii\helpers\Url;
 
 
 

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($request['error']) && isset($request['error'][1])) {
     $error = \bedezign\yii2\audit\models\AuditError::findOne($request['error'][1]);
-    $request['error'] = Html::a('[' . $request['error'][0] . '] ' . $error->message, ['error/view', 'id' => $error->id]);
+    $request['error'] = Html::a('['.$request['error'][0].'] '.$error->message, ['error/view', 'id' => $error->id]);
 }
 
 ?>
@@ -31,7 +31,7 @@ 
     if (is_array($value) || is_object($value))
         $value = \yii\helpers\ArrayHelper::toArray($value);
     elseif ($name == 'duration')
-        $value = number_format($value, 2) . 's';
+        $value = number_format($value, 2).'s';
     echo $name == 'error' ? $value : $formatter->asText(is_scalar($value) ? $value : VarDumper::dumpAsString($value));
 ?>
                 </td>

Braces +5 added lines, -4 removed lines

@@ -28,10 +28,11 @@
                 <th><?= Html::encode(\yii\helpers\Inflector::humanize($name)) ?></th>
                 <td>
 <?php
-    if (is_array($value) || is_object($value))
-        $value = \yii\helpers\ArrayHelper::toArray($value);
-    elseif ($name == 'duration')
-        $value = number_format($value, 2) . 's';
+    if (is_array($value) || is_object($value)) {
+            $value = \yii\helpers\ArrayHelper::toArray($value);
+    } elseif ($name == 'duration') {
+            $value = number_format($value, 2) . 's';
+    }
     echo $name == 'error' ? $value : $formatter->asText(is_scalar($value) ? $value : VarDumper::dumpAsString($value));
 ?>
                 </td>

src/Audit.php

Indentation +6 added lines, -6 removed lines

@@ -373,12 +373,12 @@
 
         // We now need one more iteration to add core classes to the panels added via the merge, if needed
         array_walk($this->panels, function(&$value, $key) {
-           if (!isset($value['class'])) {
-               if (isset($this->_corePanels[$key]))
-                   $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
-               else
-                   throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
-           }
+            if (!isset($value['class'])) {
+                if (isset($this->_corePanels[$key]))
+                    $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
+                else
+                    throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+            }
         });
     }
 

Spacing +3 added lines, -3 removed lines

@@ -135,9 +135,9 @@
         // 'audit/config',
 
         // These provide special functionality and get loaded to activate it
-        'audit/error',      // Links the extra error reporting functions (`exception()` and `errorMessage()`)
-        'audit/extra',      // Links the data functions (`data()`)
-        'audit/curl',       // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
+        'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`)
+        'audit/extra', // Links the data functions (`data()`)
+        'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
     ];
 
     /**

Braces +44 added lines, -33 removed lines

@@ -239,8 +239,9 @@ 
      */
     public function registerFunction($name, $callback)
     {
-        if (isset($this->_panelFunctions[$name]))
-            throw new InvalidParamException("The '$name'-function has already been defined.");
+        if (isset($this->_panelFunctions[$name])) {
+                    throw new InvalidParamException("The '$name'-function has already been defined.");
+        }
 
         $this->_panelFunctions[$name] = $callback;
     }
@@ -260,8 +261,9 @@ 
      */
     public function __call($name, $params)
     {
-        if (!isset($this->_panelFunctions[$name]))
-            throw new \yii\base\InvalidCallException("Unknown panel function '$name'");
+        if (!isset($this->_panelFunctions[$name])) {
+                    throw new \yii\base\InvalidCallException("Unknown panel function '$name'");
+        }
 
         return call_user_func_array($this->_panelFunctions[$name], $params);
     }
@@ -333,13 +335,15 @@ 
     public function getPanel($identifier)
     {
         $config = null;
-        if (isset($this->panels[$identifier]))
-            $config = $this->panels[$identifier];
-        elseif (isset($this->_corePanels[$identifier]))
-            $config = $this->_corePanels[$identifier];
+        if (isset($this->panels[$identifier])) {
+                    $config = $this->panels[$identifier];
+        } elseif (isset($this->_corePanels[$identifier])) {
+                    $config = $this->_corePanels[$identifier];
+        }
 
-        if (!$config)
-            throw new InvalidConfigException("'$identifier' is not a valid panel identifier");
+        if (!$config) {
+                    throw new InvalidConfigException("'$identifier' is not a valid panel identifier");
+        }
 
         if (is_array($config)) {
             $config['module'] = $this;
@@ -360,11 +364,11 @@ 
         foreach ($this->panels as $key => $value) {
             if (is_numeric($key)) {
                 // The $value contains the identifier of a core panel
-                if (!isset($this->_corePanels[$value]))
-                    throw new InvalidConfigException("'$value' is not a valid panel identifier");
+                if (!isset($this->_corePanels[$value])) {
+                                    throw new InvalidConfigException("'$value' is not a valid panel identifier");
+                }
                 $panels[$value] = $this->_corePanels[$value];
-            }
-            else {
+            } else {
                 // The key contains the identifier and the value is either a class name or a full array
                 $panels[$key] = is_string($value) ? ['class' => $value] : $value;
             }
@@ -374,10 +378,11 @@ 
         // We now need one more iteration to add core classes to the panels added via the merge, if needed
         array_walk($this->panels, function(&$value, $key) {
            if (!isset($value['class'])) {
-               if (isset($this->_corePanels[$key]))
-                   $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
-               else
-                   throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+               if (isset($this->_corePanels[$key])) {
+                                  $value = ArrayHelper::merge($value, $this->_corePanels[$key]);
+               } else {
+                                  throw new InvalidConfigException("Invalid configuration for '$key'. No 'class' specified.");
+               }
            }
         });
     }
@@ -389,18 +394,21 @@ 
     {
         foreach (Yii::$app->modules as $name => $module) {
             $class = null;
-            if (is_string($module))
-                $class = $module;
-            elseif (is_array($module)) {
-                if (isset($module['class']))
-                    $class = $module['class'];
-            } else
-                /** @var Module $module */
+            if (is_string($module)) {
+                            $class = $module;
+            } elseif (is_array($module)) {
+                if (isset($module['class'])) {
+                                    $class = $module['class'];
+                }
+            } else {
+                            /** @var Module $module */
                 $class = $module::className();
+            }
 
             $parts = explode('\\', $class);
-            if ($class && strtolower(end($parts)) == 'audit')
-                return $name;
+            if ($class && strtolower(end($parts)) == 'audit') {
+                            return $name;
+            }
         }
         return null;
     }
@@ -436,18 +444,21 @@ 
             $len = strlen($compare);
             if ($compare[$len - 1] == '*') {
                 $compare = rtrim($compare, '*');
-                if (substr($route, 0, $len - 1) === $compare)
-                    return true;
+                if (substr($route, 0, $len - 1) === $compare) {
+                                    return true;
+                }
             }
 
             if ($compare[0] == '*') {
                 $compare = ltrim($compare, '*');
-                if (substr($route, - ($len - 1)) === $compare)
-                    return true;
+                if (substr($route, - ($len - 1)) === $compare) {
+                                    return true;
+                }
             }
 
-            if ($route === $compare)
-                return true;
+            if ($route === $compare) {
+                            return true;
+            }
         }
         return false;
     }

src/LogTarget.php

Braces +12 added lines, -9 removed lines

@@ -36,13 +36,15 @@ 
      */
     public function export()
     {
-        if (!\Yii::$app)
-            // Things like this can happen in tests etc, but it is too late for us to do anything about that.
+        if (!\Yii::$app) {
+                    // Things like this can happen in tests etc, but it is too late for us to do anything about that.
             return;
+        }
 
         $module = $this->module;
-        if (!$module->entry || empty($module->panels))
-            return;
+        if (!$module->entry || empty($module->panels)) {
+                    return;
+        }
 
         $entry = $module->entry;
 
@@ -53,11 +55,12 @@ 
         $records = array_filter($records);
 
         if (!empty($records)) {
-            if ($module->batchSave)
-                $entry->addBatchData($records, false);
-            else {
-                foreach ($records as $type => $record)
-                    $entry->addData($type, $record, false);
+            if ($module->batchSave) {
+                            $entry->addBatchData($records, false);
+            } else {
+                foreach ($records as $type => $record) {
+                                    $entry->addData($type, $record, false);
+                }
             }
         }
         $this->messages = [];

src/commands/AuditController.php

Spacing +12 added lines, -12 removed lines

@@ -95,9 +95,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) {
@@ -107,9 +107,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");
             }
         }
 
@@ -117,7 +117,7 @@ 
         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");
         }
 
         $this->stdout("\n");
@@ -142,11 +142,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;
     }
 
@@ -171,11 +171,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;
     }
 
@@ -207,13 +207,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'])