Internal: general fixes and cleanup

public/main/inc/lib/CourseChatUtils.php

@@ -156,9 +156,8 @@ private function createNodeWithResource(string $fileTitle, string $slug, Resourc
     }
 
     /** Sanitize and convert message to safe HTML */
-    public function prepareMessage($message)
+    public static function prepareMessage($message): string
     {
-        $this->dbg('prepareMessage.in', ['len' => strlen((string) $message)]);
         if (empty($message)) {
             return '';
         }
@@ -181,7 +180,6 @@ public function prepareMessage($message)
         );
 
         $message = MarkdownExtra::defaultTransform($message);
-        $this->dbg('prepareMessage.out', ['len' => strlen($message)]);
 
         return $message;
     }
@@ -312,7 +310,7 @@ public function saveMessage($message, $friendId = 0)
             $isMaster  = api_is_course_admin();
             $timeNow   = date('d/m/y H:i:s');
             $userPhoto = \UserManager::getUserPicture($this->userId);
-            $htmlMsg   = $this->prepareMessage($message);
+            $htmlMsg   = self::prepareMessage($message);
 
             $bubble = $isMaster
                 ? '<div class="message-teacher"><div class="content-message"><div class="chat-message-block-name">'

src/CoreBundle/Controller/Admin/SessionAdminController.php

@@ -207,7 +207,7 @@ public function listIncomplete(
             return $courseItems;
         }, $results);
 
-        $flatItems = array_merge(...$items);
+        $flatItems = array_merge([], ...array_values($items));
 
         return $this->json([
             'items' => $flatItems,

src/CoreBundle/Controller/ChatController.php

@@ -154,7 +154,7 @@ public function ajax(Request $request, ManagerRegistry $doctrine): Response
                     $msg = (string) $request->get('message', '');
                     $json = [
                         'status' => true,
-                        'data' => ['message' => $chat->prepareMessage($msg)],
+                        'data' => ['message' => CourseChatUtils::prepareMessage($msg)],
                     ];
                     $log('preview.ok', ['len' => \strlen($msg)]);