bedezign / yii2-audit

src/Audit.php

Doc Comments +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     /**
      * @param bool $create
      * @param bool $new
-     * @return AuditEntry|static
+     * @return AuditEntry
      */
     public function getEntry($create = false, $new = false)
     {

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

@@ -10,10 +10,10 @@
 
 namespace bedezign\yii2\audit;
 
+use Yii;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\models\AuditEntry;
 use bedezign\yii2\audit\models\AuditError;
-use Yii;
 use yii\base\ActionEvent;
 use yii\base\Application;
 use yii\base\InvalidConfigException;

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 +41 added lines, -31 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,12 +444,14 @@ 
             $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 ($route === $compare)
-                return true;
+            if ($route === $compare) {
+                            return true;
+            }
         }
         return false;
     }

src/components/panels/PanelTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     }
 
     /**
-     * @return array|bool
+     * @return boolean
      */
     public function getIndexUrl()
     {
@@ -48,7 +48,7 @@ 
     }
 
     /**
-     * @return string|bool
+     * @return boolean
      */
     public function getChart()
     {

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->data) . ')</small>';
+        return $this->getName().' <small>('.count($this->data).')</small>';
     }
 
     /**
@@ -80,7 +80,7 @@ 
      */
     public function getUrl()
     {
-        return Url::toRoute(['/' . $this->module->id . '/entry/view',
+        return Url::toRoute(['/'.$this->module->id.'/entry/view',
             'panel' => $this->id,
             'id' => $this->tag,
         ]);

Braces +3 added lines, -2 removed lines

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

src/components/Version.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
      * @param $id
      * @param $attribute
      * @param $version
-     * @return null|integer|float|string
+     * @return string|null
      */
     public static function findAttribute($class, $id, $attribute, $version)
     {

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/DbPanel.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\Db;
 use yii\grid\GridViewAsset;
 

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
     {
         $timings = $this->calculateTimings();
         $queryCount = count($timings);
-        $queryTime = number_format($this->getTotalQueryTime($timings) * 1000) . ' ms';
-        return $this->getName() . ' <small>(' . $queryCount . ' / ' . $queryTime . ')</small>';
+        $queryTime = number_format($this->getTotalQueryTime($timings) * 1000).' ms';
+        return $this->getName().' <small>('.$queryCount.' / '.$queryTime.')</small>';
     }
 
     /**

src/panels/ErrorPanel.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
      * @param string     $file
      * @param int        $line
      * @param array      $trace         Stack trace to include. Use `Helper::generateTrace()` to create it.
-     * @return null|static
+     * @return AuditError|null
      */
     public function logMessage($entry_id, $message, $code = 0, $file = '', $line = 0, $trace = [])
     {

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

@@ -2,12 +2,12 @@
 
 namespace bedezign\yii2\audit\panels;
 
+use Exception;
+use Yii;
 use bedezign\yii2\audit\components\Helper;
 use bedezign\yii2\audit\components\panels\Panel;
 use bedezign\yii2\audit\models\AuditError;
 use bedezign\yii2\audit\models\AuditErrorSearch;
-use Exception;
-use Yii;
 use yii\grid\GridViewAsset;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
             return $entry ? $this->log($entry->id, $e) : null;
         });
 
-        $this->module->registerFunction('errorMessage', function ($message, $code = 0, $file = '', $line = 0, $trace = []) {
+        $this->module->registerFunction('errorMessage', function($message, $code = 0, $file = '', $line = 0, $trace = []) {
             $entry = $this->module->getEntry(true);
             return $entry ? $this->logMessage($entry->id, $message, $code, $file, $line, $trace) : null;
         });
@@ -61,7 +61,7 @@ 
         $error->file        = $exception->getFile();
         $error->line        = $exception->getLine();
         $error->trace       = Helper::cleanupTrace($exception->getTrace());
-        $error->hash        = Helper::hash($error->message . $error->file . $error->line);
+        $error->hash        = Helper::hash($error->message.$error->file.$error->line);
 
         $this->_exceptions[] = $exceptionId;
 
@@ -88,7 +88,7 @@ 
         $error->file        = $file;
         $error->line        = $line;
         $error->trace       = Helper::cleanupTrace($trace);
-        $error->hash        = Helper::hash($error->message . $error->file . $error->line);
+        $error->hash        = Helper::hash($error->message.$error->file.$error->line);
         return $error->save(false) ? $error : null;
     }
 
@@ -113,7 +113,7 @@ 
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->_model->linkedErrors) . ')</small>';
+        return $this->getName().' <small>('.count($this->_model->linkedErrors).')</small>';
     }
 
     /**

Braces +9 added lines, -6 removed lines

@@ -47,12 +47,14 @@ 
     {
         // Only log each exception once
         $exceptionId = spl_object_hash($exception);
-        if (in_array($exceptionId, $this->_exceptions))
-            return true;
+        if (in_array($exceptionId, $this->_exceptions)) {
+                    return true;
+        }
 
         // If this is a follow up exception, make sure to log the base exception first
-        if ($exception->getPrevious())
-            $this->log($entry_id, $exception->getPrevious());
+        if ($exception->getPrevious()) {
+                    $this->log($entry_id, $exception->getPrevious());
+        }
 
         $error = new AuditError();
         $error->entry_id    = $entry_id;
@@ -165,8 +167,9 @@ 
     public function cleanup($maxAge = null)
     {
         $maxAge = $maxAge !== null ? $maxAge : $this->maxAge;
-        if ($maxAge === null)
-            return false;
+        if ($maxAge === null) {
+                    return false;
+        }
         return AuditError::deleteAll([
             '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days"))
         ]);

src/panels/JavascriptPanel.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\AuditJavascript;
 use bedezign\yii2\audit\models\AuditJavascriptSearch;
-use Yii;
 use yii\grid\GridViewAsset;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function getLabel()
     {
-        return $this->getName() . ' <small>(' . count($this->_model->javascripts) . ')</small>';
+        return $this->getName().' <small>('.count($this->_model->javascripts).')</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 AuditJavascript::deleteAll([
             '<=', 'created', date('Y-m-d 23:59:59', strtotime("-$maxAge days"))
         ]);

src/panels/LogPanel.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\Log;
 use yii\grid\GridViewAsset;
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     public function getLabel()
     {
         $messageCount = isset($this->data['messages']) ? count($this->data['messages']) : 0;
-        return $this->getName() . ($messageCount ? ' <small>(' . $messageCount . ')</small>' : '');
+        return $this->getName().($messageCount ? ' <small>('.$messageCount.')</small>' : '');
     }
 
     /**

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

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