Apply suggestion review bizley.

yiisoft · Jul 18, 2023 · 2b586f8 · 2b586f8
1 parent fa9a390
commit 2b586f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/framework/log/FileTarget.php b/framework/log/FileTarget.php
@@ -106,19 +106,18 @@ public function init()
      */
     public function export()
     {
-        if (strpos($this->logFile, '://') === false || strncmp($this->logFile, 'file://', 7) === 0) {
-            $logPath = dirname($this->logFile);
-            FileHelper::createDirectory($logPath, $this->dirMode, true);
-        }
-
         $text = implode("\n", array_map([$this, 'formatMessage'], $this->messages)) . "\n";
-
         $trimmedText = trim($text);
 
         if (empty($trimmedText)) {
             return; // No messages to export, so we exit the function early
         }
 
+        if (strpos($this->logFile, '://') === false || strncmp($this->logFile, 'file://', 7) === 0) {
+            $logPath = dirname($this->logFile);
+            FileHelper::createDirectory($logPath, $this->dirMode, true);
+        }
+
         if (($fp = @fopen($this->logFile, 'a')) === false) {
             throw new InvalidConfigException("Unable to append to log file: {$this->logFile}");
         }
@@ -131,12 +130,12 @@ public function export()
         if ($this->enableRotation && @filesize($this->logFile) > $this->maxFileSize * 1024) {
             $this->rotateFiles();
         }
-        $writeResult = @fwrite($fp, $text);
+        $writeResult = @fwrite($fp, $trimmedText);
         if ($writeResult === false) {
             $error = error_get_last();
             throw new LogRuntimeException("Unable to export log through file ({$this->logFile})!: {$error['message']}");
         }
-        $textSize = strlen($text);
+        $textSize = strlen($trimmedText);
         if ($writeResult < $textSize) {
             throw new LogRuntimeException("Unable to export whole log through file ({$this->logFile})! Wrote $writeResult out of $textSize bytes.");
         }

diff --git a/tests/framework/log/FileTargetTest.php b/tests/framework/log/FileTargetTest.php
@@ -123,7 +123,7 @@ public function testLogEmptyStrings()
         $logger->export();
 
         $test = file($logFile);
-        $this->assertEquals("xxx\n", $test[0]);
+        $this->assertEquals("xxx", $test[0]);
 
         $this->clearLogFile($logFile);