bedezign / yii2-audit

src/messages/config.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return [
     // string, required, root directory of all source files
-    'sourcePath' => __DIR__ . '/..',
+    'sourcePath' => __DIR__.'/..',
     // array, required, list of language codes that the extracted messages
     // should be translated to. For example, ['zh-CN', 'de'].
     'languages' => ['en', 'nl', 'ru', 'es', 'tr'],

src/commands/AuditController.php

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/AuditTrailBehavior.php

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