Fix for Implementing the Message data object (#13)

yiisoft · Dec 3, 2020 · 0f43c3f · 0f43c3f
1 parent c0e6843
commit 0f43c3f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/SyslogTarget.php b/src/SyslogTarget.php
@@ -6,6 +6,7 @@
 
 use Psr\Log\LogLevel;
 use RuntimeException;
+use Yiisoft\Log\Message;
 use Yiisoft\Log\Target;
 
 /**
@@ -82,15 +83,17 @@ public function setFormat(callable $format): Target
      */
     public function export(): void
     {
-        $messages = $this->getMessages();
+        $formattedMessages = $this->getFormattedMessages();
         openlog($this->identity, $this->options, $this->facility);
 
         if (!$this->isMessageFormatSet) {
-            $this->setFormat(static fn (array $message) => "[{$message[0]}][{$message[2]['category']}] {$message[1]}");
+            $this->setFormat(static function (Message $message) {
+                return "[{$message->level()}][{$message->context('category', '')}] {$message->message()}";
+            });
         }
 
-        foreach ($this->getFormattedMessages() as $key => $message) {
-            if (syslog($this->syslogLevels[$messages[$key][0]], $message) === false) {
+        foreach ($this->getMessages() as $key => $message) {
+            if (syslog($this->syslogLevels[$message->level()], $formattedMessages[$key]) === false) {
                 throw new RuntimeException('Unable to export log through system log.');
             }
         }

diff --git a/tests/SyslogTargetTest.php b/tests/SyslogTargetTest.php
@@ -22,6 +22,7 @@ function closelog(...$args)
 namespace Yiisoft\Log\Target\Syslog\Tests {
     use Psr\Log\LogLevel;
     use RuntimeException;
+    use Yiisoft\Log\Message;
     use Yiisoft\Log\Target\Syslog\SyslogTarget;
 
     final class SyslogTargetTest extends \PHPUnit\Framework\TestCase
@@ -43,20 +44,24 @@ public function testExport(): void
             $facility = LOG_USER;
 
             $messages = [
-                [LogLevel::INFO, 'info message', ['category' => 'app']],
-                [LogLevel::ERROR, 'error message', ['category' => 'app']],
-                [LogLevel::WARNING, 'warning message', ['category' => 'app']],
-                [LogLevel::DEBUG, 'trace message', ['category' => 'app']],
-                [LogLevel::NOTICE, 'notice message', ['category' => 'app']],
-                [LogLevel::EMERGENCY, 'emergency message', ['category' => 'app']],
-                [LogLevel::ALERT, 'alert message', ['category' => 'app']],
+                new Message(LogLevel::INFO, 'info message', ['category' => 'app']),
+                new Message(LogLevel::ERROR, 'error message', ['category' => 'app']),
+                new Message(LogLevel::WARNING, 'warning message', ['category' => 'app']),
+                new Message(LogLevel::DEBUG, 'trace message', ['category' => 'app']),
+                new Message(LogLevel::NOTICE, 'notice message', ['category' => 'app']),
+                new Message(LogLevel::EMERGENCY, 'emergency message', ['category' => 'app']),
+                new Message(LogLevel::ALERT, 'alert message', ['category' => 'app']),
             ];
 
             /* @var $syslogTarget SyslogTarget */
             $syslogTarget = $this->getMockBuilder(SyslogTarget::class)
                 ->setMethods(['openlog', 'syslog', 'formatMessages', 'closelog'])
                 ->getMock();
 
+            $syslogTarget->setFormat(static function (Message $message) {
+                return "[{$message->level()}][{$message->context('category', '')}] {$message->message()}";
+            });
+
             $syslogTarget
                 ->setIdentity($identity)
                 ->setOptions($options)
@@ -124,7 +129,7 @@ public function testFailedExport(): void
                 ->setOptions(LOG_ODELAY | LOG_PID);
 
             $syslogTarget->method('syslog')->willReturn(false);
-            $syslogTarget->collect([[LogLevel::INFO, 'test', ['category' => 'app']]], false);
+            $syslogTarget->collect([new Message(LogLevel::INFO, 'test', ['category' => 'app'])], false);
 
             self::$functions['openlog'] = function ($arguments) use ($syslogTarget) {
                 $this->assertCount(3, $arguments);