bedezign / yii2-audit

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/panels/TrailPanel.php

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

@@ -2,10 +2,10 @@
 
 namespace bedezign\yii2\audit\panels;
 
+use Yii;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\models\AuditTrail;
 use bedezign\yii2\audit\models\AuditTrailSearch;
-use Yii;
 use yii\grid\GridViewAsset;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->_model->trails) . ')</small>';
+        return $this->getName().' <small>('.count($this->_model->trails).')</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/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/LogTarget.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @link      http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license   http://www.yiiframework.com/license/
- */
+     * @link      http://www.yiiframework.com/
+     * @copyright Copyright (c) 2008 Yii Software LLC
+     * @license   http://www.yiiframework.com/license/
+     */
 
 namespace bedezign\yii2\audit;
 

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'])

src/components/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
     {
         $data = ArrayHelper::toArray($data);
         if ($simplify)
-            array_walk($data, function (&$value) {
+            array_walk($data, function(&$value) {
                 if (is_array($value) && count($value) == 1) $value = reset($value);
             });
 
@@ -167,7 +167,7 @@ 
             if (is_object($value)) {
                 $class = get_class($value);
                 // By default we just mention the object type
-                $args[$name] = 'Object(' . $class . ')';
+                $args[$name] = 'Object('.$class.')';
 
                 if ($recurseDepth > 0) {
                     // Make sure to limit the toArray to non recursive, it's much to easy to get stuck in an infinite loop
@@ -198,7 +198,7 @@ 
         $hash = bcadd(sprintf('%u', crc32($data)), 0x100000000);
         $str = '';
         do {
-            $str = $map[bcmod($hash, 62)] . $str;
+            $str = $map[bcmod($hash, 62)].$str;
             $hash = bcdiv($hash, 62);
         } while ($hash >= 1);
         return $str;

Braces +53 added lines, -35 removed lines

@@ -23,8 +23,9 @@ 
      */
     public static function serialize($data, $compact = true)
     {
-        if ($compact)
-            $data = self::compact($data);
+        if ($compact) {
+                    $data = self::compact($data);
+        }
 
         $data = serialize($data);
         $data = self::compress($data);
@@ -39,19 +40,22 @@ 
      */
     public static function unserialize($data)
     {
-        if (is_resource($data))
-            // For some databases (like Postgres) binary columns return as a resource, fetch the content first
+        if (is_resource($data)) {
+                    // For some databases (like Postgres) binary columns return as a resource, fetch the content first
             $data = stream_get_contents($data, -1, 0);
+        }
 
         $originalData = $data;
         $data = self::uncompress($data);
 
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         $data = @unserialize($data);
-        if ($data === false)
-            $data = $originalData;
+        if ($data === false) {
+                    $data = $originalData;
+        }
 
         return $data;
     }
@@ -63,8 +67,9 @@ 
      */
     public static function compress($data)
     {
-        if (Audit::getInstance()->compressData)
-            $data = gzcompress($data);
+        if (Audit::getInstance()->compressData) {
+                    $data = gzcompress($data);
+        }
         return $data;
     }
 
@@ -90,15 +95,17 @@ 
     public static function compact($data, $simplify = false, $threshold = 512)
     {
         $data = ArrayHelper::toArray($data);
-        if ($simplify)
-            array_walk($data, function (&$value) {
+        if ($simplify) {
+                    array_walk($data, function (&$value) {
                 if (is_array($value) && count($value) == 1) $value = reset($value);
+        }
             });
 
         $tooBig = [];
-        foreach ($data as $index => $value)
-            if (strlen(serialize($value)) > $threshold)
+        foreach ($data as $index => $value) {
+                    if (strlen(serialize($value)) > $threshold)
                 $tooBig[] = $index;
+        }
 
         if (count($tooBig)) {
             $data = array_diff_key($data, array_flip($tooBig));
@@ -117,8 +124,9 @@ 
     {
         $trace = debug_backtrace();
         array_pop($trace); // remove the last trace since it would be the entry script, not very useful
-        if ($skip > 0)
-            $trace = array_slice($trace, $skip);
+        if ($skip > 0) {
+                    $trace = array_slice($trace, $skip);
+        }
         return self::cleanupTrace($trace);
     }
 
@@ -130,8 +138,9 @@ 
      */
     public static function cleanupTrace($trace)
     {
-        if (!is_array($trace))
-            return [];
+        if (!is_array($trace)) {
+                    return [];
+        }
 
         foreach ($trace as $n => $call) {
             $call['file'] = isset($call['file']) ? $call['file'] : 'unknown';
@@ -140,14 +149,18 @@ 
             $call['file'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $call['file']);
 
             // XDebug
-            if (isset($call['params'])) unset($call['params']);
+            if (isset($call['params'])) {
+                unset($call['params']);
+            }
 
             // Trace entry contains the class instance, also compact and include this
-            if (isset($call['object']))
-                $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            if (isset($call['object'])) {
+                            $call['object'] = current(self::cleanupTraceArguments([$call['object']]));
+            }
 
-            if (isset($call['args']))
-                $call['args'] = self::cleanupTraceArguments($call['args']);
+            if (isset($call['args'])) {
+                            $call['args'] = self::cleanupTraceArguments($call['args']);
+            }
 
             $trace[$n] = $call;
         }
@@ -176,10 +189,11 @@ 
                     $args[$name] = $object;
                 }
             } else if (is_array($value)) {
-                if ($recurseDepth > 0)
-                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
-                else
-                    $args[$name] = 'Array';
+                if ($recurseDepth > 0) {
+                                    $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1);
+                } else {
+                                    $args[$name] = 'Array';
+                }
             }
         }
         return $args;
@@ -212,8 +226,9 @@ 
     public static function formatAsQuery($data)
     {
         $data = rawurldecode($data);
-        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data))
-            return null;
+        if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) {
+                    return null;
+        }
 
         $result = [];
         parse_str($data, $result);
@@ -241,8 +256,9 @@ 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadXML($data))
-            return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadXML($data)) {
+                    return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 
@@ -253,14 +269,16 @@ 
      */
     public static function formatAsHTML($data)
     {
-        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml')
-            return null;
+        if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') {
+                    return null;
+        }
 
         $doc = new \DOMDocument('1.0');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
-        if (@$doc->loadHTML($data))
-            return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        if (@$doc->loadHTML($data)) {
+                    return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8');
+        }
         return null;
     }
 }
\ No newline at end of file

src/components/SoapClient.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         return $this->_data['result'] = parent::__doRequest($request, $location, $action, $version, $one_way);
     }
 
-    public function __setCookie ($name, $value = null)
+    public function __setCookie($name, $value = null)
     {
         if (!isset($this->_data['cookies']))
             $this->_data['cookies'] = [];

Braces +17 added lines, -14 removed lines

@@ -14,8 +14,7 @@ 
 
         try {
             parent::__construct($wsdl, $options);
-        }
-        catch (\SoapFault $e) {
+        } catch (\SoapFault $e) {
             // Catches errors like being unable to read the WSDL and so on
             $this->logSoapFault($e);
             throw $e;
@@ -46,22 +45,24 @@ 
         try {
             $result = parent::__soapCall($function_name, $arguments, $options, $input_headers, $output_headers);
             $this->_data['duration'] = microtime(true) - $started;
-            if ($output_headers)
-                $this->_data['output_headers'] = (array) $output_headers;
+            if ($output_headers) {
+                            $this->_data['output_headers'] = (array) $output_headers;
+            }
 
-            if (is_soap_fault($result))
-                // Cover non-exception variant
+            if (is_soap_fault($result)) {
+                            // Cover non-exception variant
                 return $this->logSoapFault($result);
+            }
 
             $this->_data['result_object'] = $result;
             $this->finalize();
 
             return $result;
-        }
-        catch (\Exception $error) {
+        } catch (\Exception $error) {
             $this->_data['duration'] = microtime(true) - $started;
-            if ($output_headers)
-                $this->_data['output_headers'] = (array) $output_headers;
+            if ($output_headers) {
+                            $this->_data['output_headers'] = (array) $output_headers;
+            }
 
             $this->logSoapFault($error);
             throw $error;
@@ -82,8 +83,9 @@ 
 
     public function __setCookie ($name, $value = null)
     {
-        if (!isset($this->_data['cookies']))
-            $this->_data['cookies'] = [];
+        if (!isset($this->_data['cookies'])) {
+                    $this->_data['cookies'] = [];
+        }
         $this->_data['cookies'][$name] = $value;
 
         parent::__setCookie($name, $value);
@@ -99,7 +101,8 @@ 
     protected function finalize()
     {
         $_panel = Audit::getInstance()->getPanel('audit/soap');
-        if ($_panel)
-            $_panel->logSoapRequest($this->_data);
+        if ($_panel) {
+                    $_panel->logSoapRequest($this->_data);
+        }
     }
 }
\ No newline at end of file

src/components/console/ErrorHandler.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Console compatible error handler
- */
+     * Console compatible error handler
+     */
 
 namespace bedezign\yii2\audit\components\console;