Merge branch 'release/0.12.x'

Author: pprkut

src/Lunr/Ticks/Mqtt/MqttClient.php

@@ -237,7 +237,7 @@ protected function writeToSocket(string $data, ?int $length = NULL): void
 
             if ($this->level->atLeast(AnalyticsDetailLevel::Detailed))
             {
-                $fields['data'] = $this->prepareLogData($message->getContent());
+                $fields['requestBody'] = $this->prepareLogData($message->getContent());
             }
         }
         elseif ((ord($data[0]) >> 4) == 1)
@@ -246,7 +246,7 @@ protected function writeToSocket(string $data, ?int $length = NULL): void
 
             if ($this->level->atLeast(AnalyticsDetailLevel::Detailed))
             {
-                $fields['data'] = $this->prepareLogData(bin2hex($data));
+                $fields['requestBody'] = $this->prepareLogData(bin2hex($data));
             }
         }
         elseif ($data == chr(0xe0) . chr(0x00))
@@ -259,7 +259,7 @@ protected function writeToSocket(string $data, ?int $length = NULL): void
 
             if ($this->level->atLeast(AnalyticsDetailLevel::Detailed))
             {
-                $fields['data'] = $this->prepareLogData(bin2hex($data));
+                $fields['requestBody'] = $this->prepareLogData(bin2hex($data));
             }
         }
 

src/Lunr/Ticks/Mqtt/Tests/MqttClientWriteToSocketTest.php

@@ -436,7 +436,7 @@ public function testWriteToSocketLogsUnknownMessageAtDetailed(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => '31' . $string . '30...',
+            'requestBody'    => '31' . $string . '30...',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"UNKNOWN"}',
         ];
 
@@ -540,7 +540,7 @@ public function testWriteToSocketLogsUnknownMessageAtFull(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => '31' . $string . '3025e7a4b7d43119',
+            'requestBody'    => '31' . $string . '3025e7a4b7d43119',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"UNKNOWN"}',
         ];
 
@@ -742,7 +742,7 @@ public function testWriteToSocketLogsConnectMessageAtDetailed(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => $string . '3025...',
+            'requestBody'    => $string . '3025...',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"CONNECT"}',
         ];
 
@@ -846,7 +846,7 @@ public function testWriteToSocketLogsConnectMessageAtFull(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => $string . '3025e7a4b7d43119',
+            'requestBody'    => $string . '3025e7a4b7d43119',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"CONNECT"}',
         ];
 
@@ -1356,7 +1356,7 @@ public function testWriteToSocketLogsMessageAtDetailed(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => $string . '3025...',
+            'requestBody'    => $string . '3025...',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"PUBLISH"}',
         ];
 
@@ -1468,7 +1468,7 @@ public function testWriteToSocketLogsMessageAtFull(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => $string . '3025e7a4b7d43119',
+            'requestBody'    => $string . '3025e7a4b7d43119',
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"PUBLISH"}',
         ];
 
@@ -1575,7 +1575,7 @@ public function testWriteToSocketLogsWithContentNull(): void
             'startTimestamp' => 1734352683.3516,
             'endTimestamp'   => 1734352683.3516,
             'executionTime'  => 0.0,
-            'data'           => NULL,
+            'requestBody'    => NULL,
             'requestHeaders' => '{"qualityOfService":0,"messageId":null,"topic":null,"acknowledgedQualityOfServices":[],"type":"PUBLISH"}',
         ];