bedezign / yii2-audit

src/Audit.php

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/views/entry/panels/soap/index.php

Braces +2 added lines, -1 removed lines

@@ -6,5 +6,6 @@
 
 echo Html::tag('h1', $panel->name);
 
-foreach ($dataProvider->allModels as $index => $request)
+foreach ($dataProvider->allModels as $index => $request) {
     echo $this->render('detail', ['panel' => $panel, 'request' => $request, 'index' => $index + 1]);
+}

src/AuditTrailBehavior.php

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) {

src/components/Helper.php

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;
     }
 }